generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

Browse Source 
* qatar/release/0.8:
  lavf: fix the comparison in an overflow check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-26 00:27:29 +02:00
parent c8ca385676 9978c24abf
commit d8af960e7e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/utils.c
View File

@@ -2058,7 +2058,7 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic)
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i]; st = ic->streams[i];
if (st->codec->bit_rate > 0) { 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; bit_rate = 0;
break; break;
} }