[FFmpeg-cvslog] r26061 - trunk/libavformat/utils.c

cehoyos subversion
Mon Dec 20 10:58:28 CET 2010


Author: cehoyos
Date: Mon Dec 20 10:58:27 2010
New Revision: 26061

Log:
Fix crash if invalid bit-rate was read from file.
Fixes issue 2426.

Patch by David Czech, davidczech510 gmail

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Sun Dec 19 20:08:30 2010	(r26060)
+++ trunk/libavformat/utils.c	Mon Dec 20 10:58:27 2010	(r26061)
@@ -1870,10 +1870,11 @@ static void av_estimate_timings_from_bit
     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;



More information about the ffmpeg-cvslog mailing list