Changeset 0a382aa9 in ffmpeg

Timestamp:

Nov 19, 2013, 5:06:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6a71efff

Parents:

8983dea4 (diff), 3a16ec19 (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/19/13 17:06:22)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/19/13 17:06:40)

Message:

Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'

• commit '3a16ec19d2426457419cb8a7304f97982699efda': vf_interlace: check one av_frame_clone allocation

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

(No files)