aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-15 14:30:20 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-15 14:30:20 +0000
commit8a9d72a0ff1e46dfd42c600103ac107ec07ad518 (patch)
treeb38669be558785d0d106b09e78290f3f73020450
parentcce540c5e736e5873aef3a906b7231ce7b28df14 (diff)
downloadffmpeg-8a9d72a0ff1e46dfd42c600103ac107ec07ad518.tar.gz
Simplify by using FFMAX.
Originally committed as revision 14776 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c4
1 files changed, 1 insertions, 3 deletions
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;