Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'

[ffmpeg] / libavcodec / ratecontrol.c

diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index bf3321de8f479f23812d8e24f208805ff26cbb15..7db248ecf5fbfa74cda736119d07671b232dcccb 100644 (file)
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -328,6 +328,9 @@ int ff_vbv_update(MpegEncContext *s, int frame_size)
         rcc->buffer_index -= frame_size;
         if (rcc->buffer_index < 0) {
             av_log(s->avctx, AV_LOG_ERROR, "rc buffer underflow\n");
+            if (frame_size > max_rate && s->qscale == s->avctx->qmax) {
+                av_log(s->avctx, AV_LOG_ERROR, "max bitrate possibly too small or try trellis with large lmax or increase qmax\n");
+            }
             rcc->buffer_index = 0;
         }