Changeset ae4e7f7b in ffmpeg

Timestamp:

Nov 30, 2013, 3:23:43 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4c55aa8f

Parents:

b27ba2e5 (diff), 58c120a (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/30/13 03:21:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/30/13 03:23:43)

Message:

Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'

• commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext

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

(No files)