-
Michael Niedermayer authored
* commit '1509c018': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b61170f5
* commit '1509c018': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>