Browse Source

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

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.
tags/n1.1
Stefano Sabatini 12 years ago
parent
commit
cdea54b4c8
2 changed files with 3 additions and 7 deletions
  1. +2
    -6
      libavutil/parseutils.c
  2. +1
    -1
      libavutil/version.h

+ 2
- 6
libavutil/parseutils.c View File

@@ -57,12 +57,8 @@ int av_parse_ratio(AVRational *q, const char *str, int max,
if (ret < 0)
return ret;
*q = av_d2q(d, max);
}

gcd = av_gcd(FFABS(q->num), FFABS(q->den));
if (gcd) {
q->num /= gcd;
q->den /= gcd;
} else {
av_reduce(&q->num, &q->den, q->num, q->den, max);
}

return 0;


+ 1
- 1
libavutil/version.h View File

@@ -76,7 +76,7 @@

#define LIBAVUTIL_VERSION_MAJOR 51
#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, \
LIBAVUTIL_VERSION_MINOR, \


Loading…
Cancel
Save