diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:32:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:32:04 +0200 |
| commit | afbaf6b367e17b487864ac37fb42fed6c274c500 (patch) | |
| tree | 54a3f19fd41fd8d15d9de51f5df1fad1e4382864 /tools/zmqshell.py | |
| parent | f1da6691a41fb46059a4d4a413c6e34abea135bd (diff) | |
| parent | 7788297a59656ececd84f602292bfeb79f7eedd7 (diff) | |
| download | ffmpeg-afbaf6b367e17b487864ac37fb42fed6c274c500.tar.gz | |
Merge commit '7788297a59656ececd84f602292bfeb79f7eedd7' into release/2.2
* commit '7788297a59656ececd84f602292bfeb79f7eedd7':
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 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions