Commit 1677155d authored by Michael Niedermayer's avatar Michael Niedermayer

10l (overflows)

Originally committed as revision 4226 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 25a0a0a5
...@@ -632,10 +632,10 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st, ...@@ -632,10 +632,10 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st,
*pden = 0; *pden = 0;
switch(st->codec.codec_type) { switch(st->codec.codec_type) {
case CODEC_TYPE_VIDEO: 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; *pnum = st->time_base.num;
*pden = st->time_base.den; *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; *pnum = st->codec.time_base.num;
*pden = st->codec.time_base.den; *pden = st->codec.time_base.den;
if (pc && pc->repeat_pict) { if (pc && pc->repeat_pict) {
...@@ -1849,7 +1849,7 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -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) 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); 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){ st->time_base.num*duration_sum[i]/duration_count[i]*1000LL > st->time_base.den){
AVRational fps1; AVRational fps1;
int64_t num, den; int64_t num, den;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment