diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-11 22:59:37 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-11 22:59:37 +0000 |
| commit | 02305ff38ffcc41a72fc1cb79c028b724d2d795d (patch) | |
| tree | 2bc56b8eee4caf0c202b4a024efe5f32cf68884e | |
| parent | a957c27b037ae85b66405461d9541aeb9d4d2225 (diff) | |
| download | ffmpeg-02305ff38ffcc41a72fc1cb79c028b724d2d795d.tar.gz | |
Rename SIGN macro to FFSIGN to avoid clashes with system headers.
Originally committed as revision 6665 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/common.h | 2 | ||||
| -rw-r--r-- | libpostproc/postprocess.c | 6 | ||||
| -rw-r--r-- | libpostproc/postprocess_template.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index f71eaf839e..a4808ed83b 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -193,7 +193,7 @@ typedef uint64_t uint_fast64_t; /* 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 SIGN(a) ((a) > 0 ? 1 : -1) +#define FFSIGN(a) ((a) > 0 ? 1 : -1) #define FFMAX(a,b) ((a) > (b) ? (a) : (b)) #define FFMIN(a,b) ((a) > (b) ? (b) : (a)) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index aba73725cd..7db2ab5069 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -340,7 +340,7 @@ static inline void doHorizDefFilter_C(uint8_t dst[], int stride, PPContext *c) d= FFMAX(d, 0); d= (5*d + 32) >> 6; - d*= SIGN(-middleEnergy); + d*= FFSIGN(-middleEnergy); if(q>0) { @@ -449,7 +449,7 @@ static inline void horizX1Filter(uint8_t *src, int stride, int QP) if(d < QP) { - int v = d * SIGN(-b); + int v = d * FFSIGN(-b); src[1] +=v/8; src[2] +=v/4; @@ -542,7 +542,7 @@ static always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, PPC d= FFMAX(d, 0); d= (5*d + 32) >> 6; - d*= SIGN(-middleEnergy); + d*= FFSIGN(-middleEnergy); if(q>0) { diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index d09dd69d3c..f5fb249770 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -594,7 +594,7 @@ static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, PPContext *co) if(d < co->QP*2) { - int v = d * SIGN(-b); + int v = d * FFSIGN(-b); src[l2] +=v>>3; src[l3] +=v>>2; @@ -855,7 +855,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext d= FFMAX(d, 0); d= (5*d + 32) >> 6; - d*= SIGN(-middleEnergy); + d*= FFSIGN(-middleEnergy); if(q>0) { @@ -1159,7 +1159,7 @@ src-=8; d= FFMAX(d, 0); d= (5*d + 32) >> 6; - d*= SIGN(-middleEnergy); + d*= FFSIGN(-middleEnergy); if(q>0) { |