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)
* cus/stable:
  mpegts: always parse pcr

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

Trivial merge