Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Aug 2014 18:00:22 +0000 (20:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Aug 2014 18:00:26 +0000 (20:00 +0200)
commit3574d34aca9dfac28d61bd783a7aa9b4c2d736f0
tree673f10ac7180228bf19f7e173918e184b33add45
parent6928ea7eb0fbb12fa1d90075495fc910fbe16971
parent51748b6377ff4032dea4d5d73d42ad9199c2366f
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: always parse pcr

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