Changeset 2d0440f9 in ffmpeg

Timestamp:

Jan 16, 2015, 1:20:37 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

261e8ccb

Parents:

aee51ee8 (diff), 3941df54 (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> (01/16/15 13:20:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/16/15 13:20:37)

Message:

Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'

• commit '3941df546276b190cc9362fd093e6721e8e52f50': aea: Return proper error code on invalid header

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

(No files)