[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 16 20:00:22 2014 +0200| [3574d34aca9dfac28d61bd783a7aa9b4c2d736f0] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: always parse pcr

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3574d34aca9dfac28d61bd783a7aa9b4c2d736f0
---