Changeset 1e9a850d in ffmpeg

Timestamp:

Sep 20, 2013, 10:49:15 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

13b353a7

Parents:

35a8387b (diff), f5080335 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (09/20/13 10:42:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/20/13 10:49:15)

Message:

Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'

• commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61': asvdec: Verify the amount of extradata

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

(No files)