diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 05:24:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 05:24:54 +0100 |
commit | 109650b34b3b516d00bef94e5f1521c21bd3c3de (patch) | |
tree | 7bef435070bb4d5719ce1e2dc8e480cb93482c8b /doc/examples | |
parent | 967facb6950549d0cc4e0ba79a056ebc6f93a049 (diff) | |
parent | ee4b14322155b5808eeceb463f5edcd751eb3a98 (diff) | |
download | ffmpeg-109650b34b3b516d00bef94e5f1521c21bd3c3de.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: use frame count based queueing for audio queue
ffplay: reset audio_pkt_temp when opening audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples')
0 files changed, 0 insertions, 0 deletions