[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'
Michael Niedermayer
git at videolan.org
Sun Oct 21 19:02:13 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 18:56:50 2012 +0200| [747a00b688d74f3187e9c4dc21fe1b0ce2b63064] | committer: Michael Niedermayer
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: if there is no audio stream, use external clock by default
ffplay: use get_master_sync_type where necessary
ffplay: add get_master_sync_type function
ffplay: only check external clock if current frame serial matches the displayed frame serial
ffplay: add serial field to PacketQueue entry and populate it
ffplay: fix external time sync mode
ffplay: initialize audio and video pts drift
ffplay: fix nosync threshold check in synchronize_audio
ffplay: use framedrop by default when sync is not done to video
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=747a00b688d74f3187e9c4dc21fe1b0ce2b63064
---
More information about the ffmpeg-cvslog
mailing list