diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:21:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:31:50 +0200 |
| commit | 807b7388402eb53c2022428f17dfbeaf8312ba74 (patch) | |
| tree | d418b2fd2b0ebcf44ad262f3bd2c3d53df892fbf /libswscale/swscale_internal.h | |
| parent | a507fea70769533d2f666bcc63edc8d15b6784be (diff) | |
| parent | addbaf134836aea4e14f73add8c6d753a1373257 (diff) | |
| download | ffmpeg-807b7388402eb53c2022428f17dfbeaf8312ba74.tar.gz | |
Merge commit 'addbaf134836aea4e14f73add8c6d753a1373257' into release/1.1
* commit 'addbaf134836aea4e14f73add8c6d753a1373257':
mpegts: Do not try to write a PMT larger than SECTION_SIZE
Conflicts:
libavformat/mpegtsenc.c
See: 694c3a13c9489c6e05f88486b489dd0746d114fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
0 files changed, 0 insertions, 0 deletions