ffmpeg | branch: master | Vittorio Giovara <vittorio.giov...@gmail.com> | Sat Sep 26 23:00:57 2015 +0200| [cf7d2f2d2134c0854edf2db91e7436ac2bc9874f] | committer: Vittorio Giovara
lavc: Simplify checking quant bias option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf7d2f2d2134c0854edf2db91e7436ac2bc9874f --- 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 228ee46..d2fbc16 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 c46bcf4..862d07f 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog