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)
commitec837a08993d4272eb0e8687fe90025c2b9638ac
tree594b266e8a30a326a8c77fc033cb3df8f14dc4e1
parenta6e46ed51ab947cfd25ab8f0b99772ea11ad5bac
parent02fc61a5a68321acb9d84bf30580cbdb3a2db1d6
Merge remote-tracking branch 'cus/stable'

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