generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Originally committed as revision 6665 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-10-11 22:59:37 +00:00
parent a957c27b03
commit 02305ff38f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/common.h
View File

@ -193,7 +193,7 @@ typedef uint64_t uint_fast64_t;
/* assume b>0 */ /* assume b>0 */
#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b)) #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
#define ABS(a) ((a) >= 0 ? (a) : (-(a))) #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 FFMAX(a,b) ((a) > (b) ? (a) : (b))
#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) #define FFMIN(a,b) ((a) > (b) ? (b) : (a))

6
libpostproc/postprocess.c
View File

@ -340,7 +340,7 @@ static inline void doHorizDefFilter_C(uint8_t dst[], int stride, PPContext *c)
d= FFMAX(d, 0); d= FFMAX(d, 0);
d= (5*d + 32) >> 6; d= (5*d + 32) >> 6;
d*= SIGN(-middleEnergy); d*= FFSIGN(-middleEnergy);
if(q>0) if(q>0)
{ {
@ -449,7 +449,7 @@ static inline void horizX1Filter(uint8_t *src, int stride, int QP)
if(d < QP) if(d < QP)
{ {
int v = d * SIGN(-b); int v = d * FFSIGN(-b);
src[1] +=v/8; src[1] +=v/8;
src[2] +=v/4; 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= FFMAX(d, 0);
d= (5*d + 32) >> 6; d= (5*d + 32) >> 6;
d*= SIGN(-middleEnergy); d*= FFSIGN(-middleEnergy);
if(q>0) if(q>0)
{ {

6
libpostproc/postprocess_template.c
View File

@ -594,7 +594,7 @@ static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, PPContext *co)
if(d < co->QP*2) if(d < co->QP*2)
{ {
int v = d * SIGN(-b); int v = d * FFSIGN(-b);
src[l2] +=v>>3; src[l2] +=v>>3;
src[l3] +=v>>2; src[l3] +=v>>2;
@ -855,7 +855,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext
d= FFMAX(d, 0); d= FFMAX(d, 0);
d= (5*d + 32) >> 6; d= (5*d + 32) >> 6;
d*= SIGN(-middleEnergy); d*= FFSIGN(-middleEnergy);
if(q>0) if(q>0)
{ {
@ -1159,7 +1159,7 @@ src-=8;
d= FFMAX(d, 0); d= FFMAX(d, 0);
d= (5*d + 32) >> 6; d= (5*d + 32) >> 6;
d*= SIGN(-middleEnergy); d*= FFSIGN(-middleEnergy);
if(q>0) if(q>0)
{ {