diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 18:56:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 18:56:58 +0200 |
| commit | 747a00b688d74f3187e9c4dc21fe1b0ce2b63064 (patch) | |
| tree | 58ec0f193dc8384162e8d1fb8207acd928d7010d /libavutil/parseutils.c | |
| parent | d6e95669496a89d186f923c34bcaf7d86b7cd59c (diff) | |
| parent | 3166a6fc379789b3782f431dd232033c2069c443 (diff) | |
| download | ffmpeg-747a00b688d74f3187e9c4dc21fe1b0ce2b63064.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions