From: Clément Bœsch Date: Sat, 6 Jun 2015 10:50:21 +0000 (+0200) Subject: ffplay: use av_clip() instead of nested min & max X-Git-Tag: n2.7~95 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=0f6118c58169796bdc657794aa88bb72d25b7d98;hp=ade5684cda9c08b6a8cdecb5e6b5144d6dac8819 ffplay: use av_clip() instead of nested min & max Note: {wanted,min,max}_samples are int variables. --- diff --git a/ffplay.c b/ffplay.c index 9ce13d71fb..58034c60a9 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2412,7 +2412,7 @@ static int synchronize_audio(VideoState *is, int nb_samples) wanted_nb_samples = nb_samples + (int)(diff * is->audio_src.freq); min_nb_samples = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX) / 100)); max_nb_samples = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX) / 100)); - wanted_nb_samples = FFMIN(FFMAX(wanted_nb_samples, min_nb_samples), max_nb_samples); + wanted_nb_samples = av_clip(wanted_nb_samples, min_nb_samples, max_nb_samples); } av_log(NULL, AV_LOG_TRACE, "diff=%f adiff=%f sample_diff=%d apts=%0.3f %f\n", diff, avg_diff, wanted_nb_samples - nb_samples,