MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/libxvid: set lumi_aq for lumimasking

Browse Source 
Simplifies check and should fix lumi+vari warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-05 15:00:14 +02:00
parent 1ca3902726
commit 412df0a52f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libxvid.c
View File

@ -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++;
}