diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-02 23:22:35 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-02 23:22:35 +0000 |
commit | f04c6e35d4117c19e4a73cc4779a7093a41ac900 (patch) | |
tree | 75bb9682d7036babb554532be7d5c5c86c9dc844 /ffplay.c | |
parent | 36cbdc95393117d36885c9ba06f0df62f50cc46c (diff) | |
download | ffmpeg-f04c6e35d4117c19e4a73cc4779a7093a41ac900.tar.gz |
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
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |