diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 19:23:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 19:23:00 +0200 |
| commit | 25f4e9387d0efd6fe2ac51d78eb681c542a6f82d (patch) | |
| tree | 436efd419bb560e735df6afd621be3fd8a95636d /libavcodec/mpegvideo_enc.c | |
| parent | ae6ba2db8ff811fa1fe23c5abffcc8086dcbc052 (diff) | |
| parent | 530c1441fd1426b6a4bb33485ff3226e1ae0ad45 (diff) | |
Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
lavc: make lmax/lmin into private options of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1ab17f6a19..f059ec0afe 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -962,6 +962,10 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) 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->lmin) + s->lmin = avctx->lmin; + if (avctx->lmax) + s->lmax = avctx->lmax; if (avctx->rc_eq) { av_freep(&s->rc_eq); @@ -1781,7 +1785,7 @@ vbv_retry: int max_size = FFMAX(rcc->buffer_index * avctx->rc_max_available_vbv_use, rcc->buffer_index - 500); if (put_bits_count(&s->pb) > max_size && - s->lambda < s->avctx->lmax) { + s->lambda < s->lmax) { s->next_lambda = FFMAX(s->lambda + 1, s->lambda * (s->qscale + 1) / s->qscale); if (s->adaptive_quant) { |