[SCM] libav/experimental: Allow mpeg encoding with qscale and very low frame rate.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8d39fbd6d928753f0aeec6d78448d96b2d384400
Author: James Darnley <james.darnley at gmail.com>
Date:   Fri Sep 10 23:41:14 2010 +0000

    Allow mpeg encoding with qscale and very low frame rate.
    
    Patch by James Darnley, james D darnley A gmail
    
    Originally committed as revision 25102 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8fbd759..8302dd3 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -356,7 +356,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
         return -1;
     }
 
-    if(avctx->bit_rate*av_q2d(avctx->time_base) > avctx->bit_rate_tolerance){
+    if(!s->fixed_qscale && avctx->bit_rate*av_q2d(avctx->time_base) > avctx->bit_rate_tolerance){
         av_log(avctx, AV_LOG_ERROR, "bitrate tolerance too small for bitrate\n");
         return -1;
     }

-- 
Libav/FFmpeg packaging