Changeset d9c4f61d in ffmpeg

Timestamp:

May 29, 2014, 10:35:02 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bc59d39

Parents:

78a79a2c (diff), a53551cb (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/29/14 10:34:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/29/14 10:35:02)

Message:

Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'

• commit 'a53551cba86bb67efcb6105fdc337a36c43132bd': frame: fix the error path in av_frame_copy_props()

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

(No files)