Browse Source

lavc: Simplify checking quant bias option

tags/n3.0
Vittorio Giovara 9 years ago
parent
commit
cf7d2f2d21
2 changed files with 3 additions and 6 deletions
  1. +1
    -2
      libavcodec/dnxhdenc.c
  2. +2
    -4
      libavcodec/mpegvideo_enc.c

+ 1
- 2
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


+ 2
- 4
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


Loading…
Cancel
Save