diff --git a/cmdutils_opencl.c b/cmdutils_opencl.c index 61478e27af9df7f5a8b76280bc47f5175144359e..d9095b61be27f7620cbf304c554e33a3e306ebde 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 9caa7507508cead36963a1946b8eda219c96ff11..0aa47c8d28d4e4ee2e8e13d0459fdbf3b39e20e1 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];