diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:07:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:08:25 +0200 |
| commit | 072278c777986fc87dba5b0c372e19115b711a35 (patch) | |
| tree | a91e483f8830986ea72c949cc7dbfdca2a746e29 /libavcodec | |
| parent | 190106e884a28a661251e72ced6177ecc7774bda (diff) | |
| parent | 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1 (diff) | |
Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
libxvid: add working lumimasking and variance AQ
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libxvid.c | 13 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 97ab2d4a07..12b2f705c2 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -531,25 +531,26 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { xvid_enc_create.num_plugins++; } - if ( avctx->lumi_masking != 0.0) + if (avctx->lumi_masking != 0.0) x->lumi_aq = 1; /* Luminance Masking */ - if( x->lumi_aq ) { + if (x->lumi_aq) { masking_l.method = 0; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_lumimasking; /* The old behavior is that when avctx->lumi_masking is specified, * plugins[...].param = NULL. Trying to keep the old behavior here. */ - plugins[xvid_enc_create.num_plugins].param = avctx->lumi_masking ? NULL : &masking_l ; - xvid_enc_create.num_plugins++; + plugins[xvid_enc_create.num_plugins].param = avctx->lumi_masking ? NULL + : &masking_l; + xvid_enc_create.num_plugins++; } /* Variance AQ */ - if( x->variance_aq ) { + if (x->variance_aq) { masking_v.method = 1; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_lumimasking; - plugins[xvid_enc_create.num_plugins].param = &masking_v ; + plugins[xvid_enc_create.num_plugins].param = &masking_v; xvid_enc_create.num_plugins++; } diff --git a/libavcodec/version.h b/libavcodec/version.h index fa1aaa9529..2f9f7036fa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 58 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |