diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 13:14:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 13:14:33 +0200 |
commit | 5682a93841be2bff87262746d58c5e0b67c0dc06 (patch) | |
tree | 27bb82835d08d1da025396ccaf6b754b9eed61c9 /libavformat/soxenc.c | |
parent | a15c5c44e262c115f5e5820b35447012aa214955 (diff) | |
parent | 5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a (diff) | |
download | ffmpeg-5682a93841be2bff87262746d58c5e0b67c0dc06.tar.gz |
Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'
* commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a':
mpegts: pass MpegTSContext ptr explicitly
See: 8635954335061ea4c03d3f492b7bc803ea740d9c:
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/soxenc.c')
0 files changed, 0 insertions, 0 deletions