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>

diff --cc libavcodec/libxvid.c
index 97ab2d4a07345c4e1ae963819bb93ed72f3aa4e8,42614eaab435f3e0d87e85b96d5ec7c3ea0f63a0..12b2f705c2c8b4955bc6de8185ada3a29ef217be
--- 1/libavcodec/libxvid.c
--- 2/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@@ -531,11 -523,17 +531,11 @@@ static av_cold int xvid_encode_init(AVC
          xvid_enc_create.num_plugins++;
      }
  
-     if ( avctx->lumi_masking != 0.0)
+     if (avctx->lumi_masking != 0.0)
          x->lumi_aq = 1;
  
 -    if (x->lumi_aq && x->variance_aq) {
 -        x->variance_aq = 0
 -        av_log(avctx, AV_LOG_WARNING,
 -               "variance_aq is ignored when lumi_aq is set.\n");
 -    }
 -
      /* Luminance Masking */
-     if( x->lumi_aq ) {
+     if (x->lumi_aq) {
          masking_l.method = 0;
          plugins[xvid_enc_create.num_plugins].func = xvid_plugin_lumimasking;
  

diff --cc libavcodec/version.h
index fa1aaa9529bbb5289eae0ded93745823a96cb0c5,738b816d1b52705be35c968207dee916a8e5bf6f..2f9f7036facccbf3fe4101c6d9d26c1e62574e5b
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 45
 -#define LIBAVCODEC_VERSION_MICRO  1
 +#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, \