[FFmpeg-cvslog] avutil/rational: never return greater num/den than the maximum allowed in av_d2q

Marton Balint git at videolan.org
Sat Nov 16 22:16:11 EET 2024


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Nov 10 14:10:03 2024 +0100| [d884606ce0f46161ada47568b3d7336d697c1061] | committer: Marton Balint

avutil/rational: never return greater num/den than the maximum allowed in av_d2q

This reverts 887d74c47efa70d7d1513e9492d41cf7f88dee0b, because it ignores the
maximum allowed numerator/denominator. Even if the result was rounded to zero
or infinity, it should not be cause to ignore the maximum allowed number, this
"feature" is unintuitive and undocumented.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d884606ce0f46161ada47568b3d7336d697c1061
---

 libavutil/rational.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavutil/rational.c b/libavutil/rational.c
index 329fbf3302..1b7c6350e9 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -118,8 +118,6 @@ AVRational av_d2q(double d, int max)
     // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64,
     // see Ticket2713 for affected gcc/glibc versions
     av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max);
-    if ((!a.num || !a.den) && d && max>0 && max<INT_MAX)
-        av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, INT_MAX);
 
     return a;
 }



More information about the ffmpeg-cvslog mailing list