diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:44:59 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:44:59 +0000 |
| commit | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (patch) | |
| tree | 144c6e7680198c13152d9cdd704c972f640a0216 /libavcodec/mpegvideo_enc.c | |
| parent | b986a4625d0e67710f155a9816dbab186a98020e (diff) | |
| parent | 12b49769223234673db1003d9c43e7483ceb0282 (diff) | |
Merge commit '12b49769223234673db1003d9c43e7483ceb0282'
* commit '12b49769223234673db1003d9c43e7483ceb0282':
lavc: Move mpeg_quant to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2914ae2c65..dd3b4c6642 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -369,7 +369,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->codec_id = avctx->codec->id; s->strict_std_compliance = avctx->strict_std_compliance; s->quarter_sample = (avctx->flags & AV_CODEC_FLAG_QPEL) != 0; - s->mpeg_quant = avctx->mpeg_quant; s->rtp_mode = !!avctx->rtp_payload_size; s->intra_dc_precision = avctx->intra_dc_precision; @@ -604,6 +603,13 @@ FF_ENABLE_DEPRECATION_WARNINGS return -1; } +#if FF_API_PRIVATE_OPT + FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->mpeg_quant) + s->mpeg_quant = avctx->mpeg_quant; + FF_ENABLE_DEPRECATION_WARNINGS +#endif + // FIXME mpeg2 uses that too if (s->mpeg_quant && ( s->codec_id != AV_CODEC_ID_MPEG4 && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) { |