Skip to content

F
ffmpeg
Commit cf7d2f2d authored by Vittorio Giovara's avatar Vittorio Giovara
Browse files
Options

lavc: Simplify checking quant bias option

parent 84dfc426
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
libavcodec/dnxhdenc.c
View file @ cf7d2f2d
...@@ -344,8 +344,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ...@@ -344,8 +344,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
......
libavcodec/mpegvideo_enc.c
View file @ cf7d2f2d
...@@ -548,11 +548,9 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -548,11 +548,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