contribs: drop win64 patch for libswscale

diff --git a/contrib/src/ffmpeg/ffmpeg-win64.patch b/contrib/src/ffmpeg/ffmpeg-win64.patch
deleted file mode 100644 (file)
index 2863290..0000000
--- a/contrib/src/ffmpeg/ffmpeg-win64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: ffmpeg-svn/libswscale/swscale_template.c
-===================================================================
---- ffmpeg-svn/libswscale/swscale_template.c   (revision 31036)
-+++ ffmpeg-svn/libswscale/swscale_template.c   (working copy)
-@@ -2466,6 +2466,7 @@
-         }
-     } else {
- #endif /* COMPILE_TEMPLATE_MMX2 */
-+#if 0
-         x86_reg xInc_shr16 = (x86_reg) (xInc >> 16);
-         uint16_t xInc_mask = xInc & 0xffff;
-         __asm__ volatile(
-@@ -2501,6 +2502,7 @@
-             "r" (src2)
-             : "%"REG_a, "%"REG_d, "%ecx", "%"REG_D, "%esi"
-         );
-+#endif
- #if COMPILE_TEMPLATE_MMX2
-     } //if MMX2 can't be used
- #endif

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index c9bbea8c63d69d17f4ebfb290417003b8621115a..dca09c1cc153a7553877b2be462d2feab35ff1ca 100644 (file)
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -116,9 +116,6 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
        rm -Rf ffmpeg-git
        mkdir -p ffmpeg-git
        zcat "$<" | (cd ffmpeg-git && tar xv --strip-components=1)
-ifdef HAVE_WIN64
-       $(APPLY) $(SRC)/ffmpeg/ffmpeg-win64.patch
-endif
 ifdef HAVE_WIN32
        sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
 endif

diff --git a/extras/contrib/src/Patches/ffmpeg-win64.patch b/extras/contrib/src/Patches/ffmpeg-win64.patch
deleted file mode 100644 (file)
index ea65999..0000000
--- a/extras/contrib/src/Patches/ffmpeg-win64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: swscale_template.c
-===================================================================
---- swscale_template.c (revision 31036)
-+++ swscale_template.c (working copy)
-@@ -2466,6 +2466,7 @@
-         }
-     } else {
- #endif /* COMPILE_TEMPLATE_MMX2 */
-+#if 0
-         x86_reg xInc_shr16 = (x86_reg) (xInc >> 16);
-         uint16_t xInc_mask = xInc & 0xffff;
-         __asm__ volatile(
-@@ -2501,6 +2502,7 @@
-             "r" (src2)
-             : "%"REG_a, "%"REG_d, "%ecx", "%"REG_D, "%esi"
-         );
-+#endif
- #if COMPILE_TEMPLATE_MMX2
-     } //if MMX2 can't be used
- #endif

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 2a28a7dfb4303ebc67b39f20f32269a87333621c..21829bbd5db04f173b66bfffff85b62509cc04de 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1086,9 +1086,6 @@ ffmpeg:
 ifdef HAVE_ISA_THUMB
        patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif
-ifdef HAVE_WIN64
-       (cd ffmpeg/libswscale; patch -p0 < ../../Patches/ffmpeg-win64.patch;)
-endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch