virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavc: Simplify checking quant bias option

Browse Source
This commit is contained in:
Vittorio Giovara 2015-09-26 23:00:57 +02:00
parent 84dfc426ce
commit cf7d2f2d21
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/dnxhdenc.c
View File

@ -344,8 +344,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
#if FF_API_QUANT_BIAS
FF_DISABLE_DEPRECATION_WARNINGS
if (ctx->intra_quant_bias == FF_DEFAULT_QUANT_BIAS &&
avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
ctx->intra_quant_bias = avctx->intra_quant_bias;
FF_ENABLE_DEPRECATION_WARNINGS
#endif

6
libavcodec/mpegvideo_enc.c
View File

@ -548,11 +548,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
#if FF_API_QUANT_BIAS
FF_DISABLE_DEPRECATION_WARNINGS
if (s->intra_quant_bias == FF_DEFAULT_QUANT_BIAS &&
avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
s->intra_quant_bias = avctx->intra_quant_bias;
if (s->inter_quant_bias == FF_DEFAULT_QUANT_BIAS &&
avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
s->inter_quant_bias = avctx->inter_quant_bias;
FF_ENABLE_DEPRECATION_WARNINGS
#endif