Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Nov 2014 00:04:46 +0000 (01:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Nov 2014 00:05:10 +0000 (01:05 +0100)
* cus/stable:
  ffplay: signal the frame queue before closing audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge