diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:27:59 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:27:59 +0200 |
| commit | 773570a9dce94922471530d29585e5e87ff64f7a (patch) | |
| tree | 70f82cc0f1652a8063e6deae287cca1ed0ecc3e5 | |
| parent | 24fea89983756fcd9bfee475581a7b049b3ad8ee (diff) | |
| parent | cf7d2f2d2134c0854edf2db91e7436ac2bc9874f (diff) | |
| download | ffmpeg-773570a9dce94922471530d29585e5e87ff64f7a.tar.gz | |
Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'
* commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f':
lavc: Simplify checking quant bias option
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/dnxhdenc.c | 3 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index af843996e9..7d96cd4f78 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -360,8 +360,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 76eb40f073..b604a079d5 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -710,11 +710,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 |