diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 13:51:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-10-18 05:28:40 +0200 |
| commit | 15ec053c4c0b198a2e93eb8e60c8f41e091e0c40 (patch) | |
| tree | 841ae38eb749335b045b4526f016c4e6bafc20e1 /libavcodec/mpegvideo_enc.c | |
| parent | c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866 (diff) | |
| download | ffmpeg-15ec053c4c0b198a2e93eb8e60c8f41e091e0c40.tar.gz | |
lavc: make border_masking into private options of mpegvideo encoders
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2084fe99ed..6bb4eeb65a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -329,12 +329,19 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) /* Fixed QSCALE */ s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE); +#if FF_API_MPV_OPT + FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->border_masking != 0.0) + s->border_masking = avctx->border_masking; + FF_ENABLE_DEPRECATION_WARNINGS +#endif + s->adaptive_quant = (s->avctx->lumi_masking || s->avctx->dark_masking || s->avctx->temporal_cplx_masking || s->avctx->spatial_cplx_masking || s->avctx->p_masking || - s->avctx->border_masking || + s->border_masking || (s->mpv_flags & FF_MPV_FLAG_QP_RD)) && !s->fixed_qscale; |