Michael Niedermayer a7a82f2f22 Merge commit 'c389a804943095ebf078daec6b64690d2c97069c' ...

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

Conflicts:
	libavcodec/libxvid.c
	libavcodec/version.h

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

2014-04-07 03:20:23 +02:00

28 KiB

Raw Blame History

View Raw