ffmpeg | branch: master | Ganesh Ajjanagadde <[email protected]> | Sat Oct 24 20:59:05 2015 -0400| [c7131762c021a3e5073f30e144ab3790177e8920] | committer: Ganesh Ajjanagadde
all: add const-correctness to qsort comparators This adds const-correctness when needed for the comparators. Reviewed-by: Ronald S. Bultje <[email protected]> Signed-off-by: Ganesh Ajjanagadde <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7131762c021a3e5073f30e144ab3790177e8920 --- cmdutils_opencl.c | 2 +- libswresample/swresample-test.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmdutils_opencl.c b/cmdutils_opencl.c index 61478e2..d9095b6 100644 --- a/cmdutils_opencl.c +++ b/cmdutils_opencl.c @@ -206,7 +206,7 @@ end: static int compare_ocl_device_desc(const void *a, const void *b) { - return ((OpenCLDeviceBenchmark*)a)->runtime - ((OpenCLDeviceBenchmark*)b)->runtime; + return ((const OpenCLDeviceBenchmark*)a)->runtime - ((const OpenCLDeviceBenchmark*)b)->runtime; } int opt_opencl_bench(void *optctx, const char *opt, const char *arg) diff --git a/libswresample/swresample-test.c b/libswresample/swresample-test.c index 9caa750..0aa47c8 100644 --- a/libswresample/swresample-test.c +++ b/libswresample/swresample-test.c @@ -138,8 +138,8 @@ static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleForm } } -static int cmp(const int *a, const int *b){ - return *a - *b; +static int cmp(const void *a, const void *b){ + return *(const int *)a - *(const int *)b; } static void audiogen(void *data, enum AVSampleFormat sample_fmt, @@ -271,7 +271,7 @@ int main(int argc, char **argv){ r = (seed * (uint64_t)(max_tests - test)) >>32; FFSWAP(int, remaining_tests[r], remaining_tests[max_tests - test - 1]); } - qsort(remaining_tests + max_tests - num_tests, num_tests, sizeof(remaining_tests[0]), (void*)cmp); + qsort(remaining_tests + max_tests - num_tests, num_tests, sizeof(remaining_tests[0]), cmp); in_sample_rate=16000; for(test=0; test<num_tests; test++){ char in_layout_string[256]; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
