[FFmpeg-cvslog] avcodec/libxvid: set lumi_aq for lumimasking

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  5 15:00:14 2013 +0200| [412df0a52f24d104131c17755212471818b5748b] | committer: Michael Niedermayer

avcodec/libxvid: set lumi_aq for lumimasking

Simplifies check and should fix lumi+vari warning

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=412df0a52f24d104131c17755212471818b5748b
---

 libavcodec/libxvid.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index edf5f43..d1d4114 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -531,14 +531,17 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx)  {
         xvid_enc_create.num_plugins++;
     }
 
+    if ( avctx->lumi_masking != 0.0)
+        x->lumi_aq = 1;
+
     /* Luminance Masking */
-    if( avctx->lumi_masking != 0.0 || 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 = x->lumi_aq ? &masking_l : NULL ;
+        plugins[xvid_enc_create.num_plugins].param = avctx->lumi_masking ? NULL : &masking_l ;
         xvid_enc_create.num_plugins++;
     }