diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:36:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:49:03 +0200 |
| commit | a5d67bc796e1f9a2b99b43ea807166b655e4bdbc (patch) | |
| tree | dedf5da5d11d4ea1dec25ebc7012fc4ff14d68ef /libavformat | |
| parent | d07d54fd56034bc42b4f3d5242278f0e62f84abb (diff) | |
| download | ffmpeg-a5d67bc796e1f9a2b99b43ea807166b655e4bdbc.tar.gz | |
avformat/utils: Fix bitrate overflow check
The check added in df33a58e5311ee9a64a573889b883a80e981af7b does not work
at all, rather it broke the summing of bitrates completely.
The comparission was wrong way around.
This commit replaces it by a simpler and hopefully clearer check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index c99df71f6d..277b559a76 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2219,18 +2219,15 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) /* if bit_rate is already set, we believe it */ if (ic->bit_rate <= 0) { - int bit_rate = 0; + int64_t 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; } } - ic->bit_rate = bit_rate; + if (bit_rate <= INT_MAX) + ic->bit_rate = bit_rate; } /* if duration is already set, we believe it */ |