generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid cast of double nan to int.

Browse Source 
It may cause exceptions on some platform.

Originally committed as revision 25311 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-10-02 09:50:56 +00:00
parent 8bf256bcc0
commit 1405782cf4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/rational.c
View File

@ -96,10 +96,12 @@ AVRational av_sub_q(AVRational b, AVRational c){
AVRational av_d2q(double d, int max){ AVRational av_d2q(double d, int max){
AVRational a; AVRational a;
#define LOG2 0.69314718055994530941723212145817656807550013436025 #define LOG2 0.69314718055994530941723212145817656807550013436025
int exponent= FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0); int exponent;
int64_t den= 1LL << (61 - exponent); int64_t den;
if (isnan(d)) if (isnan(d))
return (AVRational){0,0}; return (AVRational){0,0};
exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
den = 1LL << (61 - exponent);
av_reduce(&a.num, &a.den, (int64_t)(d * den + 0.5), den, max); av_reduce(&a.num, &a.den, (int64_t)(d * den + 0.5), den, max);
return a; return a;