Changeset e77b9853 in ffmpeg

Timestamp:

May 1, 2014, 3:03:59 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7426acff

Parents:

e40ae8cc (diff), a2941c8c (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 'a2941c8cb216bdc144953cace64973f5600ffa2d'

• commit 'a2941c8cb216bdc144953cace64973f5600ffa2d': lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:

libavcodec/version.h

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

(No files)