From 502e858fd2cae24d5090acd5c79619b93756baa3 Mon Sep 17 00:00:00 2001 From: Peter Belkner Date: Sat, 14 May 2011 13:22:46 +0200 Subject: [PATCH] swscale: fix compile on mingw32 Compiling "swscale.c" breaks on MINGW32 because of multiple including "libswscale_template.c" --- libswscale/swscale_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index c1a2d44bbe..e53cfc0752 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -1829,6 +1829,7 @@ static inline void RENAME(nv21ToUV)(uint8_t *dstU, uint8_t *dstV, } // FIXME Maybe dither instead. +#ifndef YUV_NBPS #define YUV_NBPS(depth, endianness, rfunc) \ static inline void endianness ## depth ## ToUV_c(uint8_t *dstU, uint8_t *dstV, \ const uint16_t *srcU, const uint16_t *srcV, \ @@ -1852,6 +1853,7 @@ YUV_NBPS( 9, LE, AV_RL16) YUV_NBPS( 9, BE, AV_RB16) YUV_NBPS(10, LE, AV_RL16) YUV_NBPS(10, BE, AV_RB16) +#endif // YUV_NBPS #if COMPILE_TEMPLATE_MMX static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, const uint8_t *src, long width, enum PixelFormat srcFormat)