diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 02:11:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 02:13:46 +0200 |
| commit | 1d7544b752e73c4c554caca3dfc22ba23050f879 (patch) | |
| tree | 4c35764ff335b24a5d060dedde3667bd35eeb0d4 /COPYING.GPLv2 | |
| parent | af5ec182252d869c62e327b3b2ffe3dc043fabbd (diff) | |
| parent | e8049af1325dd59a51546c15b2e71a0f578e9d27 (diff) | |
| download | android_external_ffmpeg-1d7544b752e73c4c554caca3dfc22ba23050f879.tar.gz android_external_ffmpeg-1d7544b752e73c4c554caca3dfc22ba23050f879.tar.bz2 android_external_ffmpeg-1d7544b752e73c4c554caca3dfc22ba23050f879.zip | |
Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'
* commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27':
mpegts: Do not try to write a PMT larger than SECTION_SIZE
Conflicts:
libavformat/mpegtsenc.c
See: 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions