virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Make av_d2q() manage the case in which the value to convert is inf.

Browse Source 
Originally committed as revision 25332 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-10-04 13:41:01 +00:00
parent 9276bdddca
commit 6b4ed22f75
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/avutil.h
View File

@@ -41,7 +41,7 @@
#define LIBAVUTIL_VERSION_MAJOR 50 #define LIBAVUTIL_VERSION_MAJOR 50
#define LIBAVUTIL_VERSION_MINOR 32 #define LIBAVUTIL_VERSION_MINOR 32
#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_MICRO 1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \

2
libavutil/rational.c
View File

@@ -100,6 +100,8 @@ AVRational av_d2q(double d, int max){
int64_t den; int64_t den;
if (isnan(d)) if (isnan(d))
return (AVRational){0,0}; return (AVRational){0,0};
if (isinf(d))
return (AVRational){ d<0 ? -1:1, 0 };
exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0); exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
den = 1LL << (61 - exponent); 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);

2
libavutil/rational.h
View File

@@ -107,6 +107,8 @@ AVRational av_sub_q(AVRational b, AVRational c) av_const;
/** /**
* Convert a double precision floating point number to a rational. * Convert a double precision floating point number to a rational.
* inf is expressed as {1,0} or {-1,0} depending on the sign.
*
* @param d double to convert * @param d double to convert
* @param max the maximum allowed numerator and denominator * @param max the maximum allowed numerator and denominator
* @return (AVRational) d * @return (AVRational) d