Changeset 42f3cb41 in ffmpeg

Timestamp:

Nov 21, 2014, 9:12:46 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

75819faf

Parents:

15ed7ca4 (diff), 863ee8a8 (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> (11/21/14 20:39:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/21/14 21:12:46)

Message:

Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'

• commit '863ee8a855b8ce27ffef41479eb66da58763faed': lavfi: clean memory on error in ADD_FORMAT()

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

(No files)