summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/utils.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b12d5b8694..4d4b701baa 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2220,15 +2220,18 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic)
/* if bit_rate is already set, we believe it */
if (ic->bit_rate <= 0) {
- int64_t bit_rate = 0;
+ int bit_rate = 0;
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
if (st->codec->bit_rate > 0) {
+ if (INT_MAX - st->codec->bit_rate < bit_rate) {
+ bit_rate = 0;
+ break;
+ }
bit_rate += st->codec->bit_rate;
}
}
- if (bit_rate <= INT_MAX)
- ic->bit_rate = bit_rate;
+ ic->bit_rate = bit_rate;
}
/* if duration is already set, we believe it */