diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-11 23:17:58 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-11 23:17:58 +0000 |
| commit | c26abfa5414becf3dd68d976ef5851c5cab477b6 (patch) | |
| tree | 5a98401cf286223f51c29c0eab36f2a33b5f12e3 /libavutil | |
| parent | 02305ff38ffcc41a72fc1cb79c028b724d2d795d (diff) | |
| download | ffmpeg-c26abfa5414becf3dd68d976ef5851c5cab477b6.tar.gz | |
Rename ABS macro to FFABS.
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/common.h | 2 | ||||
| -rw-r--r-- | libavutil/rational.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index a4808ed83b..9a836f1b57 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -192,7 +192,7 @@ typedef uint64_t uint_fast64_t; #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) /* assume b>0 */ #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b)) -#define ABS(a) ((a) >= 0 ? (a) : (-(a))) +#define FFABS(a) ((a) >= 0 ? (a) : (-(a))) #define FFSIGN(a) ((a) > 0 ? 1 : -1) #define FFMAX(a,b) ((a) > (b) ? (a) : (b)) diff --git a/libavutil/rational.c b/libavutil/rational.c index 1924c687d0..4f343f7e32 100644 --- a/libavutil/rational.c +++ b/libavutil/rational.c @@ -36,10 +36,10 @@ 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(ABS(nom), ABS(den)); + int64_t gcd= ff_gcd(FFABS(nom), FFABS(den)); - nom = ABS(nom)/gcd; - den = ABS(den)/gcd; + nom = FFABS(nom)/gcd; + den = FFABS(den)/gcd; if(nom<=max && den<=max){ a1= (AVRational){nom, den}; den=0; |