diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 14:17:41 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 14:18:41 +0200 |
commit | fc67d937cc73fb68ab8d840e319e89c52df79c3d (patch) | |
tree | b82eb1bb43742eede1a5e2189419b79bb63bc9e9 /libavcodec/mpegvideo_enc.c | |
parent | ec8f56efad2c1a150e822f6b11c54915446a2d09 (diff) | |
parent | 66a68ddd1ac376b24db8695058bc8fc28f5bada6 (diff) | |
download | ffmpeg-fc67d937cc73fb68ab8d840e319e89c52df79c3d.tar.gz |
Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'
* commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6':
lavc: make rc_buffer_aggressivity/rc_initial_cplx 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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 83c2b6831f..4b926a5e7d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -958,6 +958,10 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->rc_qmod_amp = avctx->rc_qmod_amp; if (avctx->rc_qmod_freq) s->rc_qmod_freq = avctx->rc_qmod_freq; + if (avctx->rc_buffer_aggressivity != 1.0) + s->rc_buffer_aggressivity = avctx->rc_buffer_aggressivity; + if (avctx->rc_initial_cplx != 0.0) + s->rc_initial_cplx = avctx->rc_initial_cplx; if (avctx->rc_eq) { av_freep(&s->rc_eq); |