FFmpeg/libavcodec
Michael Niedermayer a7a82f2f22 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>
2014-04-07 03:20:23 +02:00
..
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-03-22 03:12:18 +01:00
2014-04-05 03:32:11 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-04-04 04:00:11 +02:00
2014-03-26 04:20:52 +01:00
2014-03-31 01:11:16 +02:00
2014-04-01 13:43:44 +02:00
2014-03-16 23:29:51 +01:00
2014-04-04 04:00:11 +02:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00