diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-25 15:39:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 17:10:36 +0200 |
| commit | 887d74c47efa70d7d1513e9492d41cf7f88dee0b (patch) | |
| tree | 6e7d82a13892e0f0ac4ab2a7b908d907a0da574a | |
| parent | f77467a11dbf88876e98a9cbce427c5646e1d193 (diff) | |
| download | ffmpeg-887d74c47efa70d7d1513e9492d41cf7f88dee0b.tar.gz | |
av_d2q: Add a special case for |value| > MAX and |value| < 1/MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/rational.c | 2 | ||||
| -rw-r--r-- | tests/ref/fate/parseutils | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/rational.c b/libavutil/rational.c index 7abf54cd0b..aabe58f684 100644 --- a/libavutil/rational.c +++ b/libavutil/rational.c @@ -115,6 +115,8 @@ AVRational av_d2q(double d, int max) exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0); den = 1LL << (61 - exponent); av_reduce(&a.num, &a.den, rint(d * den), den, max); + if ((!a.num || !a.den) && d && max>0 && max<INT_MAX) + av_reduce(&a.num, &a.den, llrint(d * den), den, INT_MAX); return a; } diff --git a/tests/ref/fate/parseutils b/tests/ref/fate/parseutils index 5fa3bf4e1c..1482452857 100644 --- a/tests/ref/fate/parseutils +++ b/tests/ref/fate/parseutils @@ -21,7 +21,7 @@ Testing av_parse_video_rate() '.23' -> 23/100 OK '-.23' -> -23/100 ERROR '-0.234' -> -117/500 ERROR -'-0.0000001' -> 0/1 ERROR +'-0.0000001' -> -1/10000000 ERROR ' 21332.2324 ' -> 917286/43 OK ' -21332.2324 ' -> -917286/43 ERROR |