]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Mar 2012 04:24:50 +0000 (05:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Mar 2012 04:24:54 +0000 (05:24 +0100)
commit109650b34b3b516d00bef94e5f1521c21bd3c3de
tree7bef435070bb4d5719ce1e2dc8e480cb93482c8b
parent967facb6950549d0cc4e0ba79a056ebc6f93a049
parentee4b14322155b5808eeceb463f5edcd751eb3a98
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>