[SCM] libav/experimental: Avoid rollover in settings conversion.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9d845ca40cff56c8c0dc04cc76964b0573ef9796
Author: James Zern <jzern at google.com>
Date:   Sun Dec 12 16:27:32 2010 +0000

    Avoid rollover in settings conversion.
    
    Patch by James Zern, jzern google
    
    Originally committed as revision 25941 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 4e16c72..d0838ba 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -244,17 +244,17 @@ static av_cold int vp8_init(AVCodecContext *avctx)
     //0-100 (0 => CBR, 100 => VBR)
     enccfg.rc_2pass_vbr_bias_pct           = round(avctx->qcompress * 100);
     enccfg.rc_2pass_vbr_minsection_pct     =
-        avctx->rc_min_rate * 100 / avctx->bit_rate;
+        avctx->rc_min_rate * 100LL / avctx->bit_rate;
     if (avctx->rc_max_rate)
         enccfg.rc_2pass_vbr_maxsection_pct =
-            avctx->rc_max_rate * 100 / avctx->bit_rate;
+            avctx->rc_max_rate * 100LL / avctx->bit_rate;
 
     if (avctx->rc_buffer_size)
         enccfg.rc_buf_sz         =
-            avctx->rc_buffer_size * 1000 / avctx->bit_rate;
+            avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
     if (avctx->rc_initial_buffer_occupancy)
         enccfg.rc_buf_initial_sz =
-            avctx->rc_initial_buffer_occupancy * 1000 / avctx->bit_rate;
+            avctx->rc_initial_buffer_occupancy * 1000LL / avctx->bit_rate;
     enccfg.rc_buf_optimal_sz     = enccfg.rc_buf_sz * 5 / 6;
 
     //_enc_init() will balk if kf_min_dist differs from max w/VPX_KF_AUTO

-- 
Libav/FFmpeg packaging