Rename SIGN macro to FFSIGN to avoid clashes with system headers.

Originally committed as revision 6665 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/common.h b/libavutil/common.h
index f71eaf839e213a0f858590cc55c3d1c2e54b01f5..a4808ed83bb0cd6dbb1bc2fdcda209d185707f29 100644 (file)
--- 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 aba73725cdd26aa6a95362b376c0d408d2b44919..7db2ab506966f58d4ee895aac22b5ad180642801 100644 (file)
--- 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 d09dd69d3c74748ee6b079b097169c9f7dff5cfd..f5fb249770a3a7767d3946d5dd7799278d2ee0c4 100644 (file)
--- 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)
                         {