[SCM] libav/experimental: do not override rc_buffer_occupancy if set

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 079e8cb9623a17f552bc98284a22ac14fbe5c3e5
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Jan 22 10:01:14 2007 +0000

    do not override rc_buffer_occupancy if set
    
    Originally committed as revision 7641 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index d12af7b..4c1c4af 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2868,7 +2868,8 @@ static void new_video_stream(AVFormatContext *oc)
             if(p) p++;
         }
         video_enc->rc_override_count=i;
-        video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size*3/4;
+        if (!video_enc->rc_initial_buffer_occupancy)
+            video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size*3/4;
         video_enc->me_threshold= me_threshold;
         video_enc->intra_dc_precision= intra_dc_precision - 8;
         video_enc->strict_std_compliance = strict;

-- 
Libav/FFmpeg packaging