Mercurial > libavutil.hg
changeset 607:819752f80c64 libavutil
export gcd function as av_gcd()
| author | aurel |
|---|---|
| date | Sat, 17 Jan 2009 11:13:33 +0000 |
| parents | 69a03cf910a0 |
| children | 1f5c80e92fd0 |
| files | avutil.h common.h mathematics.c mathematics.h rational.c |
| diffstat | 5 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/avutil.h Fri Jan 16 02:14:07 2009 +0000 +++ b/avutil.h Sat Jan 17 11:13:33 2009 +0000 @@ -35,7 +35,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 49 -#define LIBAVUTIL_VERSION_MINOR 12 +#define LIBAVUTIL_VERSION_MINOR 13 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
--- a/common.h Fri Jan 16 02:14:07 2009 +0000 +++ b/common.h Sat Jan 17 11:13:33 2009 +0000 @@ -242,9 +242,6 @@ else return a; } -/* math */ -int64_t av_const ff_gcd(int64_t a, int64_t b); - /** * converts fourcc string to int */
--- a/mathematics.c Fri Jan 16 02:14:07 2009 +0000 +++ b/mathematics.c Sat Jan 17 11:13:33 2009 +0000 @@ -48,8 +48,8 @@ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 }; -int64_t ff_gcd(int64_t a, int64_t b){ - if(b) return ff_gcd(b, a%b); +int64_t av_gcd(int64_t a, int64_t b){ + if(b) return av_gcd(b, a%b); else return a; }
--- a/mathematics.h Fri Jan 16 02:14:07 2009 +0000 +++ b/mathematics.h Sat Jan 17 11:13:33 2009 +0000 @@ -49,6 +49,8 @@ AV_ROUND_NEAR_INF = 5, ///< round to nearest and halfway cases away from zero }; +int64_t av_const av_gcd(int64_t a, int64_t b); + /** * rescale a 64bit integer with rounding to nearest. * a simple a*b/c isn't possible as it can overflow
--- a/rational.c Fri Jan 16 02:14:07 2009 +0000 +++ b/rational.c Sat Jan 17 11:13:33 2009 +0000 @@ -35,7 +35,7 @@ int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){ AVRational a0={0,1}, a1={1,0}; int sign= (nom<0) ^ (den<0); - int64_t gcd= ff_gcd(FFABS(nom), FFABS(den)); + int64_t gcd= av_gcd(FFABS(nom), FFABS(den)); if(gcd){ nom = FFABS(nom)/gcd; @@ -66,7 +66,7 @@ nom= den; den= next_den; } - assert(ff_gcd(a1.num, a1.den) <= 1U); + assert(av_gcd(a1.num, a1.den) <= 1U); *dst_nom = sign ? -a1.num : a1.num; *dst_den = a1.den;