diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 849c4d340442e7433f673da422b8a0196a160b83..540e2f6faa161f2676b7700740f9eb0973974308 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1082,6 +1082,7 @@ ifdef HAVE_DARWIN_OS_ON_INTEL endif ifdef HAVE_DARWIN_OS (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch) + (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-libswscale-head.patch) endif ifdef NO_TEXT_RELOCATION (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch) diff --git a/extras/contrib/src/Patches/ffmpeg-libswscale-head.patch b/extras/contrib/src/Patches/ffmpeg-libswscale-head.patch new file mode 100644 index 0000000000000000000000000000000000000000..a298793fa792ad8507d048ba2915d00077e3a00f --- /dev/null +++ b/extras/contrib/src/Patches/ffmpeg-libswscale-head.patch @@ -0,0 +1,58 @@ +Index: swscale_template.c +=================================================================== +--- swscale_template.c (revision 27579) ++++ swscale_template.c (working copy) +@@ -1904,7 +1904,7 @@ + BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RU , GU<<5, BU<<10, RV , GV<<5, BV<<10, RGB2YUV_SHIFT+7) + + #ifdef HAVE_MMX +-static inline void bgr24ToY_mmx(uint8_t *dst, uint8_t *src, long width, int srcFormat) ++static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, uint8_t *src, long width, int srcFormat) + { + + if(srcFormat == PIX_FMT_BGR24){ +@@ -1957,7 +1957,7 @@ + ); + } + +-static inline void bgr24ToUV_mmx(uint8_t *dstU, uint8_t *dstV, uint8_t *src, long width, int srcFormat) ++static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, uint8_t *src, long width, int srcFormat) + { + asm volatile( + "movq 24+%4, %%mm6 \n\t" +@@ -2019,7 +2019,7 @@ + static inline void RENAME(bgr24ToY)(uint8_t *dst, uint8_t *src, long width) + { + #ifdef HAVE_MMX +- bgr24ToY_mmx(dst, src, width, PIX_FMT_BGR24); ++ RENAME(bgr24ToY_mmx)(dst, src, width, PIX_FMT_BGR24); + #else + int i; + for (i=0; i