Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 00:41:22 +0000 (02:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 00:41:26 +0000 (02:41 +0200)
* cus/stable:
  ffplay: always send zero packets to flush audio decoders
  ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation

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

Trivial merge