[FFmpeg-cvslog] r14776 - trunk/ffplay.c

michael subversion
Fri Aug 15 16:30:21 CEST 2008


Author: michael
Date: Fri Aug 15 16:30:20 2008
New Revision: 14776

Log:
Simplify by using FFMAX.


Modified:
   trunk/ffplay.c

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Fri Aug 15 16:30:20 2008
@@ -1039,9 +1039,7 @@ static void video_refresh_timer(void *op
                 /* 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;




More information about the ffmpeg-cvslog mailing list