[SCM] libav/experimental: Fix crash if invalid bit-rate was read from file. Fixes issue 2426.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9100d4d6327b077c44e5fdbc8082255f11953978
Author: David Czech <davidczech510 at gmail.com>
Date:   Mon Dec 20 09:58:27 2010 +0000

    Fix crash if invalid bit-rate was read from file.
    Fixes issue 2426.
    
    Patch by David Czech, davidczech510 gmail
    
    Originally committed as revision 26061 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index c8e6d66..61aa7d4 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1870,10 +1870,11 @@ static void av_estimate_timings_from_bit_rate(AVFormatContext *ic)
     AVStream *st;
 
     /* if bit_rate is already set, we believe it */
-    if (ic->bit_rate == 0) {
+    if (ic->bit_rate <= 0) {
         bit_rate = 0;
         for(i=0;i<ic->nb_streams;i++) {
             st = ic->streams[i];
+            if (st->codec->bit_rate > 0)
             bit_rate += st->codec->bit_rate;
         }
         ic->bit_rate = bit_rate;

-- 
Libav/FFmpeg packaging