diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 00:27:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 00:27:46 +0200 |
| commit | d8af960e7ebadbdc93a8f27a2967b5cdf5535f56 (patch) | |
| tree | 128016587157488de584808e1ca0a867fd93bdcd | |
| parent | c8ca38567669278dde3a50d2d7e4fa2f831ef044 (diff) | |
| parent | 9978c24abfbbde6d5db80bf8e6ff9b525ef8c42d (diff) | |
| download | ffmpeg-d8af960e7ebadbdc93a8f27a2967b5cdf5535f56.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
lavf: fix the comparison in an overflow check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 3141b9d5e8..a06ef4377c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2058,7 +2058,7 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) 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) { + if (INT_MAX - st->codec->bit_rate < bit_rate) { bit_rate = 0; break; } |