Changeset be0b869b in ffmpeg

Timestamp:

Nov 29, 2013, 9:27:28 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ad13b8ca

Parents:

f924d6e4 (diff), 35e0833d (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.

Message:

Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'

• commit '35e0833d410e31d9fd35695ad798c5d13de2af58': mpeg4videodec: add a mpeg4-specific private context.

Conflicts:

libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c

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

(No files)