Changeset e40ae8cc in ffmpeg

Timestamp:

May 1, 2014, 2:56:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e77b9853

Parents:

18516439 (diff), 64841491 (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 '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

• commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400': lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:

libavcodec/libxvid.c
libavcodec/version.h

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

(No files)