[Ffmpeg-cvslog] CVS: ffmpeg/libavformat utils.c,1.145,1.146

Michael Niedermayer CVS michael
Thu May 12 18:27:08 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv26397

Modified Files:
	utils.c 
Log Message:
10l (overflows)


Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- utils.c	6 May 2005 23:41:47 -0000	1.145
+++ utils.c	12 May 2005 16:27:05 -0000	1.146
@@ -632,10 +632,10 @@
     *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 @@
             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;





More information about the ffmpeg-cvslog mailing list