From 9100d4d6327b077c44e5fdbc8082255f11953978 Mon Sep 17 00:00:00 2001 From: David Czech Date: Mon, 20 Dec 2010 09:58:27 +0000 Subject: [PATCH] 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 --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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;inb_streams;i++) { st = ic->streams[i]; + if (st->codec->bit_rate > 0) bit_rate += st->codec->bit_rate; } ic->bit_rate = bit_rate; -- 2.7.4