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)
* 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>

Trivial merge