From 8a9d72a0ff1e46dfd42c600103ac107ec07ad518 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 15 Aug 2008 14:30:20 +0000 Subject: Simplify by using FFMAX. Originally committed as revision 14776 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffplay.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ffplay.c') diff --git a/ffplay.c b/ffplay.c index 33ee806009..74c97c5020 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1039,9 +1039,7 @@ static void video_refresh_timer(void *opaque) /* skip or repeat frame. We take into account the delay to compute the threshold. I still don't know if it is the best guess */ - sync_threshold = AV_SYNC_THRESHOLD; - if (delay > sync_threshold) - sync_threshold = delay; + sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay); if (fabs(diff) < AV_NOSYNC_THRESHOLD) { if (diff <= -sync_threshold) delay = 0; -- cgit v1.2.3