comparison postprocess_template.c @ 134:ced16a4fbbec libpostproc

Fix warnings about redefining constants when compiling libpostproc. Patch by Yuriy Kaminskiy, yumkam mail ru
author cehoyos
date Tue, 02 Feb 2010 19:35:52 +0000
parents 51571e34b760
children 0397ed4317ef
comparison
equal deleted inserted replaced
133:51571e34b760 134:ced16a4fbbec
25 25
26 #include "libavutil/x86_cpu.h" 26 #include "libavutil/x86_cpu.h"
27 27
28 #define ALIGN_MASK "$-8" 28 #define ALIGN_MASK "$-8"
29 29
30 #undef REAL_PAVGB
30 #undef PAVGB 31 #undef PAVGB
31 #undef PMINUB 32 #undef PMINUB
32 #undef PMAXUB 33 #undef PMAXUB
33 34
34 #if HAVE_MMX2 35 #if HAVE_MMX2
1057 "lea (%%"REG_a", %1, 4), %%"REG_d" \n\t" 1058 "lea (%%"REG_a", %1, 4), %%"REG_d" \n\t"
1058 1059
1059 // 0 1 2 3 4 5 6 7 8 9 1060 // 0 1 2 3 4 5 6 7 8 9
1060 // %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 %0+8%1 edx+4%1 1061 // %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 %0+8%1 edx+4%1
1061 1062
1063 #undef REAL_FIND_MIN_MAX
1062 #undef FIND_MIN_MAX 1064 #undef FIND_MIN_MAX
1063 #if HAVE_MMX2 1065 #if HAVE_MMX2
1064 #define REAL_FIND_MIN_MAX(addr)\ 1066 #define REAL_FIND_MIN_MAX(addr)\
1065 "movq " #addr ", %%mm0 \n\t"\ 1067 "movq " #addr ", %%mm0 \n\t"\
1066 "pminub %%mm0, %%mm7 \n\t"\ 1068 "pminub %%mm0, %%mm7 \n\t"\
3005 3007
3006 /** 3008 /**
3007 * Copies a block from src to dst and fixes the blacklevel. 3009 * Copies a block from src to dst and fixes the blacklevel.
3008 * levelFix == 0 -> do not touch the brighness & contrast 3010 * levelFix == 0 -> do not touch the brighness & contrast
3009 */ 3011 */
3012 #undef REAL_SCALED_CPY
3010 #undef SCALED_CPY 3013 #undef SCALED_CPY
3011 3014
3012 static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t src[], int srcStride, 3015 static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t src[], int srcStride,
3013 int levelFix, int64_t *packedOffsetAndScale) 3016 int levelFix, int64_t *packedOffsetAndScale)
3014 { 3017 {