[Ffmpeg-cvslog] r7187 - trunk/libavutil/rational.c

michael subversion
Thu Nov 30 12:43:08 CET 2006


Author: michael
Date: Thu Nov 30 12:43:08 2006
New Revision: 7187

Modified:
   trunk/libavutil/rational.c

Log:
fix overflow and remove wrong comment


Modified: trunk/libavutil/rational.c
==============================================================================
--- trunk/libavutil/rational.c	(original)
+++ trunk/libavutil/rational.c	Thu Nov 30 12:43:08 2006
@@ -46,7 +46,7 @@
     }
 
     while(den){
-        int64_t x       = nom / den;
+        uint64_t x      = nom / den;
         int64_t next_den= nom - den*x;
         int64_t a2n= x*a1.num + a0.num;
         int64_t a2d= x*a1.den + a0.den;
@@ -55,7 +55,6 @@
             if(a1.num) x= (max - a0.num) / a1.num;
             if(a1.den) x= FFMIN(x, (max - a0.den) / a1.den);
 
-            // Won't overflow, sum == original denominator
             if (den*(2*x*a1.den + a0.den) > nom*a1.den)
                 a1 = (AVRational){x*a1.num + a0.num, x*a1.den + a0.den};
             break;




More information about the ffmpeg-cvslog mailing list