[FFmpeg-cvslog] ffplay: use av_clip() instead of nested min & max

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jun  6 12:50:21 2015 +0200| [0f6118c58169796bdc657794aa88bb72d25b7d98] | committer: Clément Bœsch

ffplay: use av_clip() instead of nested min & max

Note: {wanted,min,max}_samples are int variables.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f6118c58169796bdc657794aa88bb72d25b7d98
---

 ffplay.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffplay.c b/ffplay.c
index 9ce13d7..58034c6 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,