Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jul 2014 11:14:27 +0000 (13:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jul 2014 11:14:33 +0000 (13:14 +0200)
* commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a':
  mpegts: pass MpegTSContext ptr explicitly

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

Trivial merge