[SCM] libav/experimental: Fix warnings about redefining constants when compiling libpostproc.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5d39be73cba3158b8b26f833b6c03bd9035027d8
Author: Yuriy Kaminskiy <yumkam at mail.ru>
Date:   Tue Feb 2 19:35:52 2010 +0000

    Fix warnings about redefining constants when compiling libpostproc.
    
    Patch by Yuriy Kaminskiy, yumkam mail ru
    
    Originally committed as revision 21607 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index d02e12b..00df0d7 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -27,6 +27,7 @@
 
 #define ALIGN_MASK "$-8"
 
+#undef REAL_PAVGB
 #undef PAVGB
 #undef PMINUB
 #undef PMAXUB
@@ -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        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
 #if HAVE_MMX2
 #define REAL_FIND_MIN_MAX(addr)\
@@ -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.
  * levelFix == 0 -> do not touch the brighness & contrast
  */
+#undef REAL_SCALED_CPY
 #undef SCALED_CPY
 
 static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t src[], int srcStride,

-- 
Libav/FFmpeg packaging