[SCM] libav/experimental: sanity checks for bitrate tolerance and buffer size (= fail if a single frame at the requested bitrate would be bigger than the buffer size)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 64be2e60ef7b7b7f0da9b4a0921e4cfdf8f87da2
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun May 20 01:35:15 2007 +0000

    sanity checks for bitrate tolerance and buffer size (= fail if a single frame at the
    requested bitrate would be bigger than the buffer size)
    
    Originally committed as revision 9077 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 28b84e3..8f07b61 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1029,6 +1029,16 @@ int MPV_encode_init(AVCodecContext *avctx)
         return -1;
     }
 
+    if(avctx->rc_buffer_size && avctx->bit_rate*av_q2d(avctx->time_base) > avctx->rc_buffer_size){
+        av_log(avctx, AV_LOG_INFO, "VBV buffer too small for bitrate\n");
+        return -1;
+    }
+
+    if(avctx->bit_rate*av_q2d(avctx->time_base) > avctx->bit_rate_tolerance){
+        av_log(avctx, AV_LOG_INFO, "bitrate tolerance too small for bitrate\n");
+        return -1;
+    }
+
     if(   s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate
        && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO)
        && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){

-- 
Libav/FFmpeg packaging