diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-12 16:27:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-12 16:27:05 +0000 |
| commit | 1677155df8ee2dbf6c99738b289e27c2237506bd (patch) | |
| tree | feed6a477f8dc0eb9d6b3860fd53570c516700ce | |
| parent | 25a0a0a58f8ee8d0b34c1ab33679d8316159e323 (diff) | |
| download | ffmpeg-1677155df8ee2dbf6c99738b289e27c2237506bd.tar.gz | |
10l (overflows)
Originally committed as revision 4226 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d02d4091b3..868ff81c49 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -632,10 +632,10 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st, *pden = 0; switch(st->codec.codec_type) { case CODEC_TYPE_VIDEO: - if(st->time_base.num*1000 > st->time_base.den){ + if(st->time_base.num*1000LL > st->time_base.den){ *pnum = st->time_base.num; *pden = st->time_base.den; - }else if(st->codec.time_base.num*1000 > st->codec.time_base.den){ + }else if(st->codec.time_base.num*1000LL > st->codec.time_base.den){ *pnum = st->codec.time_base.num; *pden = st->codec.time_base.den; if (pc && pc->repeat_pict) { @@ -1849,7 +1849,7 @@ int av_find_stream_info(AVFormatContext *ic) if(st->codec.codec_id == CODEC_ID_RAWVIDEO && !st->codec.codec_tag && !st->codec.bits_per_sample) st->codec.codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec.pix_fmt); - if(duration_count[i] && st->codec.time_base.num*1000 <= st->codec.time_base.den && + if(duration_count[i] && st->codec.time_base.num*1000LL <= st->codec.time_base.den && st->time_base.num*duration_sum[i]/duration_count[i]*1000LL > st->time_base.den){ AVRational fps1; int64_t num, den; |