diff options
| -rw-r--r-- | cmdutils.c | 2 | ||||
| -rw-r--r-- | cmdutils_opencl.c | 4 | ||||
| -rw-r--r-- | ffmpeg.c | 3 | ||||
| -rw-r--r-- | libavfilter/f_sendcmd.c | 6 | ||||
| -rw-r--r-- | libavfilter/vf_deshake.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_palettegen.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_removegrain.c | 5 | ||||
| -rw-r--r-- | libavformat/subtitles.c | 9 |
8 files changed, 13 insertions, 21 deletions
diff --git a/cmdutils.c b/cmdutils.c index e3e989184c..41daa9565d 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1421,7 +1421,7 @@ static int compare_codec_desc(const void *a, const void *b) const AVCodecDescriptor * const *da = a; const AVCodecDescriptor * const *db = b; - return (*da)->type != (*db)->type ? (*da)->type - (*db)->type : + return (*da)->type != (*db)->type ? FFDIFFSIGN((*da)->type, (*db)->type) : strcmp((*da)->name, (*db)->name); } diff --git a/cmdutils_opencl.c b/cmdutils_opencl.c index d9095b61be..dd21344a05 100644 --- a/cmdutils_opencl.c +++ b/cmdutils_opencl.c @@ -206,7 +206,9 @@ end: static int compare_ocl_device_desc(const void *a, const void *b) { - return ((const OpenCLDeviceBenchmark*)a)->runtime - ((const OpenCLDeviceBenchmark*)b)->runtime; + const OpenCLDeviceBenchmark* va = (const OpenCLDeviceBenchmark*)a; + const OpenCLDeviceBenchmark* vb = (const OpenCLDeviceBenchmark*)b; + return FFDIFFSIGN(va->runtime , vb->runtime); } int opt_opencl_bench(void *optctx, const char *opt, const char *arg) @@ -2578,8 +2578,7 @@ static InputStream *get_input_stream(OutputStream *ost) static int compare_int64(const void *a, const void *b) { - int64_t va = *(int64_t *)a, vb = *(int64_t *)b; - return va < vb ? -1 : va > vb ? +1 : 0; + return FFDIFFSIGN(*(const int64_t *)a, *(const int64_t *)b); } static int init_output_stream(OutputStream *ost, char *error, int error_len) diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 37aedc59f2..fb30220e7c 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -364,11 +364,7 @@ static int cmp_intervals(const void *a, const void *b) { const Interval *i1 = a; const Interval *i2 = b; - int64_t ts_diff = i1->start_ts - i2->start_ts; - int ret; - - ret = ts_diff > 0 ? 1 : ts_diff < 0 ? -1 : 0; - return ret == 0 ? i1->index - i2->index : ret; + return 2 * FFDIFFSIGN(i1->start_ts, i2->start_ts) + FFDIFFSIGN(i1->index, i2->index); } static av_cold int init(AVFilterContext *ctx) diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index e32436d00c..79fcc200e1 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -94,8 +94,7 @@ AVFILTER_DEFINE_CLASS(deshake); static int cmp(const void *a, const void *b) { - const double va = *(const double *)a, vb = *(const double *)b; - return va < vb ? -1 : ( va > vb ? 1 : 0 ); + return FFDIFFSIGN(*(const double *)a, *(const double *)b); } /** diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index df57c10982..fccc5ca3fc 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -130,7 +130,7 @@ static int cmp_color(const void *a, const void *b) { const struct range_box *box1 = a; const struct range_box *box2 = b; - return box1->color - box2->color; + return FFDIFFSIGN(box1->color , box2->color); } static av_always_inline int diff(const uint32_t a, const uint32_t b) diff --git a/libavfilter/vf_removegrain.c b/libavfilter/vf_removegrain.c index 3a28b15cdb..898e50f101 100644 --- a/libavfilter/vf_removegrain.c +++ b/libavfilter/vf_removegrain.c @@ -83,10 +83,9 @@ static int mode01(int c, int a1, int a2, int a3, int a4, int a5, int a6, int a7, static int cmp_int(const void *p1, const void *p2) { - int left = *(const int *)p1; + int left = *(const int *)p1; int right = *(const int *)p2; - - return ((left > right) - (left < right)); + return FFDIFFSIGN(left, right); } static int mode02(int c, int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 471d600c10..7c6cd5f353 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -146,12 +146,9 @@ static int cmp_pkt_sub_ts_pos(const void *a, const void *b) { const AVPacket *s1 = a; const AVPacket *s2 = b; - if (s1->pts == s2->pts) { - if (s1->pos == s2->pos) - return 0; - return s1->pos > s2->pos ? 1 : -1; - } - return s1->pts > s2->pts ? 1 : -1; + if (s1->pts == s2->pts) + return FFDIFFSIGN(s1->pos, s2->pos); + return FFDIFFSIGN(s1->pts , s2->pts); } static int cmp_pkt_sub_pos_ts(const void *a, const void *b) |