Changeset 6a510909 in ffmpeg

Timestamp:

May 18, 2014, 11:10:24 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c7c11058

Parents:

68c05185 (diff), d256ed78 (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> (05/18/14 11:09:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/18/14 11:10:24)

Message:

Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'

• commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977': 4xm: allocate extradata properly.

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

(No files)