[FFmpeg-cvslog] r23280 - trunk/libavutil/rational.c

conrad subversion
Mon May 24 02:44:02 CEST 2010


Author: conrad
Date: Mon May 24 02:44:02 2010
New Revision: 23280

Log:
Convert NaN to 0/0 in av_d2q

This fixes aspect ratio calculation for encoding from files with 0/0 stored,
common with ogg/theora

Modified:
   trunk/libavutil/rational.c

Modified: trunk/libavutil/rational.c
==============================================================================
--- trunk/libavutil/rational.c	Mon May 24 01:33:38 2010	(r23279)
+++ trunk/libavutil/rational.c	Mon May 24 02:44:02 2010	(r23280)
@@ -98,6 +98,8 @@ AVRational av_d2q(double d, int max){
 #define LOG2  0.69314718055994530941723212145817656807550013436025
     int exponent= FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
     int64_t den= 1LL << (61 - exponent);
+    if (isnan(d))
+        return (AVRational){0,0};
     av_reduce(&a.num, &a.den, (int64_t)(d * den + 0.5), den, max);
 
     return a;



More information about the ffmpeg-cvslog mailing list