Changeset eeeb3c8f in ffmpeg

Timestamp:

Sep 23, 2013, 12:27:09 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

50138a92

Parents:

ef7e8efc (diff), f7e6169 (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 'f7e616959aff8706edccdae763c24c897c449f6f'

• commit 'f7e616959aff8706edccdae763c24c897c449f6f': electronicarts: Check packet sizes before reading

Conflicts:

libavformat/electronicarts.c

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

(No files)