diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 19:08:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 19:09:33 +0200 |
| commit | 437a0ae1a1059296cb7c06973126dee5097d6ab3 (patch) | |
| tree | 395c402e17a7b6c5117f4761822a1f31b96cf967 /libavcodec/atrac1.c | |
| parent | da19bfb2876d63829146bb2103c03e867b86a4ef (diff) | |
| parent | ebe2292eafa7cac71dcdddb865e18c05635fe117 (diff) | |
| download | ffmpeg-437a0ae1a1059296cb7c06973126dee5097d6ab3.tar.gz | |
Merge commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117' into release/0.10
* commit 'ebe2292eafa7cac71dcdddb865e18c05635fe117':
mpegts: Do not try to write a PMT larger than SECTION_SIZE
Conflicts:
libavformat/mpegtsenc.c
See: 68b14c044a4a00d69aeb620bdb57dce533c4190a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac1.c')
0 files changed, 0 insertions, 0 deletions