Changeset 26b526e7 in ffmpeg

Timestamp:

Nov 29, 2013, 10:55:00 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2d614e9b

Parents:

f5d6541b (diff), a5a7199 (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:53:57)

git-committer:

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

Message:

Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'

• commit 'a5a71992cae34b321ceb8374f44ce17a945a3881': mpeg4videoenc: don't set MpegEncContext.resync_marker

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

(No files)