virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2014-04-07 03:19:41 +02:00
commit a7a82f2f22
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libxvid.c
View File

@ -560,9 +560,9 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
"will be the worse one of the two effects made by the AQ.\n"); "will be the worse one of the two effects made by the AQ.\n");
/* SSIM */ /* SSIM */
if( x->ssim ) { if (x->ssim) {
plugins[xvid_enc_create.num_plugins].func = xvid_plugin_ssim; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_ssim;
ssim.b_printstat = ( x->ssim == 2 ); ssim.b_printstat = x->ssim == 2;
ssim.acc = x->ssim_acc; ssim.acc = x->ssim_acc;
ssim.cpu_flags = xvid_gbl_init.cpu_flags; ssim.cpu_flags = xvid_gbl_init.cpu_flags;
ssim.b_visualize = 0; ssim.b_visualize = 0;

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 58 #define LIBAVCODEC_VERSION_MINOR 58
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \