virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

all: add const-correctness to qsort comparators

Browse Source 
This adds const-correctness when needed for the comparators.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
Ganesh Ajjanagadde
2015-10-24 20:59:05 -04:00
parent f7751a5e53
commit c7131762c0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils_opencl.c
View File

@@ -206,7 +206,7 @@ end:
static int compare_ocl_device_desc(const void *a, const void *b) 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) int opt_opencl_bench(void *optctx, const char *opt, const char *arg)

6
libswresample/swresample-test.c
View File

@@ -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){ static int cmp(const void *a, const void *b){
return *a - *b; return *(const int *)a - *(const int *)b;
} }
static void audiogen(void *data, enum AVSampleFormat sample_fmt, 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; r = (seed * (uint64_t)(max_tests - test)) >>32;
FFSWAP(int, remaining_tests[r], remaining_tests[max_tests - test - 1]); 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; in_sample_rate=16000;
for(test=0; test<num_tests; test++){ for(test=0; test<num_tests; test++){
char in_layout_string[256]; char in_layout_string[256];