har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavu/parseutils: rework rational reduction logic in av_parse_ratio()

Browse Source 
Avoid to divide num and den by gcd in case of a parsed expression, since
that is already done in av_d2q(), and force reduction in case of "a:b"
form, allowing to honour the max parameter.

The latter change is consistent with the a/b case, and with the
documentation.
This commit is contained in:
Stefano Sabatini 2012-10-16 18:15:58 +02:00
parent 935ecfb002
commit cdea54b4c8
2 changed files with 3 additions and 7 deletions

8
libavutil/parseutils.c

@ -57,12 +57,8 @@ int av_parse_ratio(AVRational *q, const char *str, int max,
if (ret < 0) if (ret < 0)
return ret; return ret;
*q = av_d2q(d, max); *q = av_d2q(d, max);
} } else {
av_reduce(&q->num, &q->den, q->num, q->den, max);
gcd = av_gcd(FFABS(q->num), FFABS(q->den));
if (gcd) {
q->num /= gcd;
q->den /= gcd;
} }
return 0; return 0;

2
libavutil/version.h

@ -76,7 +76,7 @@
#define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR 76 #define LIBAVUTIL_VERSION_MINOR 76
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 101
#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, \