Commit a9a76fbe authored by Rafaël Carré's avatar Rafaël Carré
Browse files

contribs: drop win64 patch for libswscale

parent 5eac86a0
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
......@@ -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
......
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
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment