Changeset 95275551 in ffmpeg

Timestamp:

Jun 16, 2013, 11:04:33 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f73d6d2a

Parents:

e99f324c (diff), ee16a0ce (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 remote-tracking branch 'qatar/master'

• qatar/master: smacker: check frame size validity

Conflicts:

libavformat/smacker.c

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

(No files)