Changeset e2f63be0 in ffmpeg

Timestamp:

Nov 29, 2013, 9:45:05 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f602e221

Parents:

ad13b8ca (diff), e62a43f6 (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 21:44:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/29/13 21:45:05)

Message:

Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'

• commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4': mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext

Conflicts:

libavcodec/mpeg4videodec.c

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

(No files)