[Ffmpeg-cvslog] r6665 - in trunk: libavutil/common.h libpostproc/postprocess.c libpostproc/postprocess_template.c

diego subversion
Thu Oct 12 00:59:37 CEST 2006


Author: diego
Date: Thu Oct 12 00:59:37 2006
New Revision: 6665

Modified:
   trunk/libavutil/common.h
   trunk/libpostproc/postprocess.c
   trunk/libpostproc/postprocess_template.c

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


Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	(original)
+++ trunk/libavutil/common.h	Thu Oct 12 00:59:37 2006
@@ -193,7 +193,7 @@
 /* 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))

Modified: trunk/libpostproc/postprocess.c
==============================================================================
--- trunk/libpostproc/postprocess.c	(original)
+++ trunk/libpostproc/postprocess.c	Thu Oct 12 00:59:37 2006
@@ -340,7 +340,7 @@
                         d= FFMAX(d, 0);
 
                         d= (5*d + 32) >> 6;
-                        d*= SIGN(-middleEnergy);
+                        d*= FFSIGN(-middleEnergy);
 
                         if(q>0)
                         {
@@ -449,7 +449,7 @@
 
                 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 @@
                                 d= FFMAX(d, 0);
 
                                 d= (5*d + 32) >> 6;
-                                d*= SIGN(-middleEnergy);
+                                d*= FFSIGN(-middleEnergy);
 
                                 if(q>0)
                                 {

Modified: trunk/libpostproc/postprocess_template.c
==============================================================================
--- trunk/libpostproc/postprocess_template.c	(original)
+++ trunk/libpostproc/postprocess_template.c	Thu Oct 12 00:59:37 2006
@@ -594,7 +594,7 @@
 
                 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 @@
                         d= FFMAX(d, 0);
 
                         d= (5*d + 32) >> 6;
-                        d*= SIGN(-middleEnergy);
+                        d*= FFSIGN(-middleEnergy);
 
                         if(q>0)
                         {
@@ -1159,7 +1159,7 @@
                         d= FFMAX(d, 0);
 
                         d= (5*d + 32) >> 6;
-                        d*= SIGN(-middleEnergy);
+                        d*= FFSIGN(-middleEnergy);
 
                         if(q>0)
                         {




More information about the ffmpeg-cvslog mailing list