diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 01:59:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 01:59:14 +0100 |
| commit | b61170f51d2e4178b3e3e7f2961d4d191b7896e2 (patch) | |
| tree | ee986673020b96a90585c3a4bdf60bb3eb1b27fd /libavformat/swf.h | |
| parent | 702cf8d0de9e31c0bc62b6a671dfc54411b22fd6 (diff) | |
| parent | 1509c018bd5b054a2354e20021ccbac9c934d213 (diff) | |
| download | ffmpeg-b61170f51d2e4178b3e3e7f2961d4d191b7896e2.tar.gz | |
Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'
* commit '1509c018bd5b054a2354e20021ccbac9c934d213':
mpegts: relax restrictions on matching the packet start in read_header
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swf.h')
0 files changed, 0 insertions, 0 deletions