Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 17:23:00 +0000 (19:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 17:23:00 +0000 (19:23 +0200)
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
  lavc: make lmax/lmin into private options of mpegvideo encoders

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/ratecontrol.c

Simple merge
Simple merge
@@@ -1778,10 -1622,10 +1782,10 @@@ vbv_retry
  
          if (avctx->rc_buffer_size) {
              RateControlContext *rcc = &s->rc_context;
 -            int max_size = rcc->buffer_index * avctx->rc_max_available_vbv_use;
 +            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) {
Simple merge
Simple merge