Changeset b4ef7447 in ffmpeg

Timestamp:

Nov 30, 2013, 1:52:09 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b08ff07d

Parents:

ec5499d8 (diff), 43af264d (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 '43af264de8606668c6b2fa7f96c946bdc3dbe072'

• commit '43af264de8606668c6b2fa7f96c946bdc3dbe072': mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext

Conflicts:

libavcodec/mpeg4videodec.c

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

(No files)