Changeset a7a82f2f in ffmpeg

Timestamp:

Apr 7, 2014, 1:20:23 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0ecb3075

Parents:

072278c7 (diff), c389a804 (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> (04/07/14 01:19:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/07/14 01:20:23)

Message:

Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'

• commit 'c389a804943095ebf078daec6b64690d2c97069c': libxvid: Add SSIM displaying through a libxvidcore plugin

Conflicts:

libavcodec/libxvid.c
libavcodec/version.h

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

(No files)