From cf7d2f2d2134c0854edf2db91e7436ac2bc9874f Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Sat, 26 Sep 2015 23:00:57 +0200
Subject: [PATCH] lavc: Simplify checking quant bias option
---
libavcodec/dnxhdenc.c | 3 +--
libavcodec/mpegvideo_enc.c | 6 ++----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 228ee4671c4..d2fbc167d26 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.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
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index c46bcf4a16e..862d07f9781 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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
--
GitLab