Changeset b61170f5 in ffmpeg

Timestamp:

Feb 11, 2015, 12:59:14 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2924514

Parents:

702cf8d0 (diff), 1509c018 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)