lavc: Simplify checking quant bias option

pull/118/merge
Vittorio Giovara 9 years ago
parent 84dfc426ce
commit cf7d2f2d21
  1. 3
      libavcodec/dnxhdenc.c
  2. 6
      libavcodec/mpegvideo_enc.c

@ -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

@ -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