Changeset 8367bc6b in ffmpeg

Timestamp:

Jan 6, 2014, 4:01:20 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2a58d5fc

Parents:

30056fd0 (diff), 9cbf2d78 (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/06/14 16:00:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 16:01:20)

Message:

Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'

• commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9': pthread_frame: unref decoded frames on failure

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

(No files)