Changeset cdc21e4a in ffmpeg

Timestamp:

Nov 29, 2013, 10:20:35 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9c835acc

Parents:

36068709 (diff), 9f0617d2 (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/29/13 22:20:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/29/13 22:20:35)

Message:

Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'

• commit '9f0617d2137bb7231b181d74392cd84ef4844cd7': mpeg4videodec: remove write-only sprite variables from MpegEncContext

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

(No files)