Commit 35d040a1 authored by cehoyos's avatar cehoyos

Fix warnings about redefining constants when compiling libpostproc.

Patch by Yuriy Kaminskiy, yumkam mail ru


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21607 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9d96322a
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define ALIGN_MASK "$-8" #define ALIGN_MASK "$-8"
#undef REAL_PAVGB
#undef PAVGB #undef PAVGB
#undef PMINUB #undef PMINUB
#undef PMAXUB #undef PMAXUB
...@@ -1059,6 +1060,7 @@ static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) ...@@ -1059,6 +1060,7 @@ static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c)
// 0 1 2 3 4 5 6 7 8 9 // 0 1 2 3 4 5 6 7 8 9
// %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 %0+8%1 edx+4%1 // %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 %0+8%1 edx+4%1
#undef REAL_FIND_MIN_MAX
#undef FIND_MIN_MAX #undef FIND_MIN_MAX
#if HAVE_MMX2 #if HAVE_MMX2
#define REAL_FIND_MIN_MAX(addr)\ #define REAL_FIND_MIN_MAX(addr)\
...@@ -3007,6 +3009,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ ...@@ -3007,6 +3009,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[
* Copies a block from src to dst and fixes the blacklevel. * Copies a block from src to dst and fixes the blacklevel.
* levelFix == 0 -> do not touch the brighness & contrast * levelFix == 0 -> do not touch the brighness & contrast
*/ */
#undef REAL_SCALED_CPY
#undef SCALED_CPY #undef SCALED_CPY
static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t src[], int srcStride, static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t src[], int srcStride,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment