Changeset 46cc498 in ffmpeg

Timestamp:

Sep 18, 2013, 9:24:27 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4131a3cb

Parents:

c1840cbd (diff), d4c2a374 (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 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'

• commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68': xmv: Add more sanity checks for parameters read from the bitstream

Conflicts:

libavformat/xmv.c

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

(No files)