virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Fix warnings about redefining constants when compiling libpostproc.

Browse Source 
Patch by Yuriy Kaminskiy, yumkam mail ru

Originally committed as revision 21607 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Yuriy Kaminskiy
2010-02-02 19:35:52 +00:00
committed by Carl Eugen Hoyos
parent 70a4764d0e
commit 5d39be73cb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpostproc/postprocess_template.c
View File

@@ -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)
// 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[
* 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,