Changeset 6c18775b in ffmpeg

Timestamp:

Sep 20, 2013, 12:51:02 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2a930fa2

Parents:

09b09ef4 (diff), 83c285f8 (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 '83c285f88016b087c2f0f4b9ef356ad8ef12d947'

• commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947': wtv: Add more sanity checks for a length read from the file

Conflicts:

libavformat/wtv.c

See: c42efad3c34cace09555e05fd0cb81cb59cc726f
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)