summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-18 13:51:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-18 13:52:06 +0200
commit17a065cf204fb626b6940b1bc3df5d6ab9f4a468 (patch)
treebfb481ba8df17aaf8bba25bdfcda02e1d8ad21c0 /libavcodec/mpegvideo_enc.c
parent74128352047ee3fb075b0f69ab16047f70b45a42 (diff)
parent946f95354ba76ef73c9b66889d86ab5fba4fb486 (diff)
Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'
* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486': lavc: make rc_qmod_* into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r--libavcodec/mpegvideo_enc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index bdf70eb9a1..76fb65480f 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -954,6 +954,10 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->rc_qsquish != 0.0)
s->rc_qsquish = avctx->rc_qsquish;
+ if (avctx->rc_qmod_amp != 0.0)
+ s->rc_qmod_amp = avctx->rc_qmod_amp;
+ if (avctx->rc_qmod_freq)
+ s->rc_qmod_freq = avctx->rc_qmod_freq;
FF_ENABLE_DEPRECATION_WARNINGS
#endif