Changeset 294af514 in ffmpeg

Timestamp:

Jun 13, 2013, 10:12:33 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e5558391

Parents:

4027e136 (diff), 50ec1db6 (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> (06/13/13 10:10:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/13/13 10:12:33)

Message:

Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'

• commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4': 4xm: fold last_picture lazy allocation in decode_p_frame

Conflicts:

libavcodec/4xm.c

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

(No files)