Commit 773570a9 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'cf7d2f2d'

* commit 'cf7d2f2d':
  lavc: Simplify checking quant bias option
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 24fea899 cf7d2f2d
...@@ -360,8 +360,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ...@@ -360,8 +360,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
#if FF_API_QUANT_BIAS #if FF_API_QUANT_BIAS
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (ctx->intra_quant_bias == FF_DEFAULT_QUANT_BIAS && if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
ctx->intra_quant_bias = avctx->intra_quant_bias; ctx->intra_quant_bias = avctx->intra_quant_bias;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
......
...@@ -710,11 +710,9 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -710,11 +710,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
#if FF_API_QUANT_BIAS #if FF_API_QUANT_BIAS
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (s->intra_quant_bias == FF_DEFAULT_QUANT_BIAS && if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
s->intra_quant_bias = avctx->intra_quant_bias; s->intra_quant_bias = avctx->intra_quant_bias;
if (s->inter_quant_bias == FF_DEFAULT_QUANT_BIAS && if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
s->inter_quant_bias = avctx->inter_quant_bias; s->inter_quant_bias = avctx->inter_quant_bias;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment