From f04c6e35d4117c19e4a73cc4779a7093a41ac900 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 2 Feb 2010 23:22:35 +0000 Subject: [PATCH] Compare the correct clocks for syncing video to audio/ext. Fixes initial delay on video from issue1134. Originally committed as revision 21618 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffplay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ffplay.c b/ffplay.c index 260fe5fdc8..593a6f73b9 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1026,8 +1026,7 @@ static double compute_frame_delay(double frame_current_pts, VideoState *is) is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) { /* if video is slave, we try to correct big delays by duplicating or deleting a frame */ - ref_clock = get_master_clock(is); - diff = frame_current_pts - ref_clock; + diff = get_video_clock(is) - get_master_clock(is); /* skip or repeat frame. We take into account the delay to compute the threshold. I still don't know