Changeset 2d614e9b in ffmpeg

Timestamp:

Nov 29, 2013, 11:49:34 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2d2b363c

Parents:

26b526e7 (diff), c2f7417 (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 23:48:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/29/13 23:49:34)

Message:

Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'

• commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e': vc1: move MpegEncContext.resync_marker into VC1Context.

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

(No files)