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)
commit5682a93841be2bff87262746d58c5e0b67c0dc06
tree27bb82835d08d1da025396ccaf6b754b9eed61c9
parenta15c5c44e262c115f5e5820b35447012aa214955
parent5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a
Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'

* commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a':
  mpegts: pass MpegTSContext ptr explicitly

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