Changeset 4fac4447 in ffmpeg

Timestamp:

May 18, 2014, 12:10:56 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4f32efdf

Parents:

213e82b5 (diff), ab3fdaa7 (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 12:09:41)

git-committer:

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

Message:

Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'

• commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0': yop: only set extradata size after it has been successfully allocated

Conflicts:

libavformat/yop.c

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

(No files)