[vlc-devel] commit: contribs/ffmpeg: removed outdated patch which prevented proper compilation ( Felix Paul Kühne )
git version control
git at videolan.org
Tue Oct 27 22:36:31 CET 2009
vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Tue Oct 27 22:33:29 2009 +0100| [a9da433bf51a844bd8b8f7df7dd81b887db24afc] | committer: Felix Paul Kühne
contribs/ffmpeg: removed outdated patch which prevented proper compilation
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9da433bf51a844bd8b8f7df7dd81b887db24afc
---
extras/contrib/src/Makefile | 6 +-
.../src/Patches/ffmpeg-macosx-intel-mmx.patch | 173 --------------------
2 files changed, 2 insertions(+), 177 deletions(-)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b1bf1d5..8f48707 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1066,10 +1066,8 @@ ifdef HAVE_BEOS
(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
endif
ifdef HAVE_DARWIN_OS
-ifdef HAVE_DARWIN_OS_ON_INTEL
- (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
-else
- (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch)
+ifndef HAVE_DARWIN_OS_ON_INTEL
+ (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch)
endif
endif
ifdef HAVE_UCLIBC
diff --git a/extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch b/extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch
deleted file mode 100644
index 97d9387..0000000
--- a/extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Index: libavcodec/x86/motion_est_mmx.c
-===================================================================
---- libavcodec/x86/motion_est_mmx.c (revision 17470)
-+++ libavcodec/x86/motion_est_mmx.c (working copy)
-@@ -168,7 +168,7 @@
- static inline void sad8_4_mmx2(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
- __asm__ volatile(
-- "movq "MANGLE(bone)", %%mm5 \n\t"
-+ "movq %4, %%mm5 \n\t"
- "movq (%1), %%mm0 \n\t"
- "pavgb 1(%1), %%mm0 \n\t"
- "add %3, %1 \n\t"
-@@ -191,7 +191,7 @@
- "sub $2, %0 \n\t"
- " jg 1b \n\t"
- : "+r" (h), "+r" (blk1), "+r" (blk2)
-- : "r" ((x86_reg)stride)
-+ : "r" ((x86_reg)stride), "m" (bone)
- );
- }
-
-@@ -259,7 +259,7 @@
- "punpckhbw %%mm7, %%mm5 \n\t"
- "paddw %%mm4, %%mm2 \n\t"
- "paddw %%mm5, %%mm3 \n\t"
-- "movq 16+"MANGLE(round_tab)", %%mm5 \n\t"
-+ "movq 16+%5, %%mm5 \n\t"
- "paddw %%mm2, %%mm0 \n\t"
- "paddw %%mm3, %%mm1 \n\t"
- "paddw %%mm5, %%mm0 \n\t"
-@@ -282,7 +282,7 @@
- "add %4, %%"REG_a" \n\t"
- " js 1b \n\t"
- : "+a" (len)
-- : "r" (blk1 - len), "r" (blk1 -len + stride), "r" (blk2 - len), "r" ((x86_reg)stride)
-+ : "r" (blk1 - len), "r" (blk1 -len + stride), "r" (blk2 - len), "r" ((x86_reg)stride), "m" (round_tab[0])
- );
- }
-
-Index: libavcodec/x86/simple_idct_mmx.c
-===================================================================
---- libavcodec/x86/simple_idct_mmx.c (revision 17470)
-+++ libavcodec/x86/simple_idct_mmx.c (working copy)
-@@ -364,7 +364,7 @@
- "movq " #src4 ", %%mm1 \n\t" /* R6 R2 r6 r2 */\
- "movq " #src1 ", %%mm2 \n\t" /* R3 R1 r3 r1 */\
- "movq " #src5 ", %%mm3 \n\t" /* R7 R5 r7 r5 */\
-- "movq "MANGLE(wm1010)", %%mm4 \n\t"\
-+ "movq %3, %%mm4 \n\t"\
- "pand %%mm0, %%mm4 \n\t"\
- "por %%mm1, %%mm4 \n\t"\
- "por %%mm2, %%mm4 \n\t"\
-@@ -438,7 +438,7 @@
- "jmp 2f \n\t"\
- "1: \n\t"\
- "pslld $16, %%mm0 \n\t"\
-- "#paddd "MANGLE(d40000)", %%mm0 \n\t"\
-+ "#paddd %4, %%mm0 \n\t"\
- "psrad $13, %%mm0 \n\t"\
- "packssdw %%mm0, %%mm0 \n\t"\
- "movq %%mm0, " #dst " \n\t"\
-@@ -472,7 +472,7 @@
- "movq " #src4 ", %%mm1 \n\t" /* R6 R2 r6 r2 */\
- "movq " #src1 ", %%mm2 \n\t" /* R3 R1 r3 r1 */\
- "movq " #src5 ", %%mm3 \n\t" /* R7 R5 r7 r5 */\
-- "movq "MANGLE(wm1010)", %%mm4 \n\t"\
-+ "movq %3, %%mm4 \n\t"\
- "pand %%mm0, %%mm4 \n\t"\
- "por %%mm1, %%mm4 \n\t"\
- "por %%mm2, %%mm4 \n\t"\
-@@ -546,7 +546,7 @@
- "jmp 2f \n\t"\
- "1: \n\t"\
- "pslld $16, %%mm0 \n\t"\
-- "paddd "MANGLE(d40000)", %%mm0 \n\t"\
-+ "paddd %4, %%mm0 \n\t"\
- "psrad $13, %%mm0 \n\t"\
- "packssdw %%mm0, %%mm0 \n\t"\
- "movq %%mm0, " #dst " \n\t"\
-@@ -1271,7 +1271,7 @@
- */
-
- "9: \n\t"
-- :: "r" (block), "r" (temp), "r" (coeffs)
-+ :: "r" (block), "r" (temp), "r" (coeffs), "m" (wm1010), "m"(d40000)
- : "%eax"
- );
- }
-Index: libavcodec/x86/cavsdsp_mmx.c
-===================================================================
---- libavcodec/x86/cavsdsp_mmx.c (revision 17470)
-+++ libavcodec/x86/cavsdsp_mmx.c (working copy)
-@@ -25,8 +25,30 @@
- #include "libavutil/common.h"
- #include "libavutil/x86_cpu.h"
- #include "libavcodec/dsputil.h"
--#include "dsputil_mmx.h"
-
-+#define SUMSUB_BA( a, b ) \
-+"paddw "#b", "#a" \n\t"\
-+"paddw "#b", "#b" \n\t"\
-+"psubw "#a", "#b" \n\t"
-+
-+#define SBUTTERFLY(a,b,t,n,m)\
-+"mov" #m " " #a ", " #t " \n\t" /* abcd */\
-+"punpckl" #n " " #b ", " #a " \n\t" /* aebf */\
-+"punpckh" #n " " #b ", " #t " \n\t" /* cgdh */\
-+
-+#define TRANSPOSE4(a,b,c,d,t)\
-+SBUTTERFLY(a,b,t,wd,q) /* a=aebf t=cgdh */\
-+SBUTTERFLY(c,d,b,wd,q) /* c=imjn b=kolp */\
-+SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\
-+SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */
-+
-+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL;
-+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_5 ) = 0x0005000500050005ULL;
-+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_7 ) = 0x0007000700070007ULL;
-+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_42) = 0x002A002A002A002AULL;
-+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_64) = 0x0040004000400040ULL;
-+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_96) = 0x0060006000600060ULL;
-+
- /*****************************************************************************
- *
- * inverse transform
-@@ -148,7 +170,7 @@
- }
-
- for(i=0; i<2; i++){
-- cavs_idct8_1d(b2+4*i, ff_pw_64.a);
-+ cavs_idct8_1d(b2+4*i, ff_pw_64);
-
- __asm__ volatile(
- "psraw $7, %%mm7 \n\t"
-Index: libavcodec/x86/flacdsp_mmx.c
-===================================================================
---- libavcodec/x86/flacdsp_mmx.c (revision 17470)
-+++ libavcodec/x86/flacdsp_mmx.c (working copy)
-@@ -27,7 +27,6 @@
- double c = 2.0 / (len-1.0);
- int n2 = len>>1;
- x86_reg i = -n2*sizeof(int32_t);
-- x86_reg j = n2*sizeof(int32_t);
- __asm__ volatile(
- "movsd %0, %%xmm7 \n\t"
- "movapd "MANGLE(ff_pd_1)", %%xmm6 \n\t"
-@@ -55,7 +54,7 @@
- "sub $8, %1 \n\t"\
- "add $8, %0 \n\t"\
- "jl 1b \n\t"\
-- :"+&r"(i), "+&r"(j)\
-+ :"+&r"(i)\
- :"r"(w_data+n2), "r"(data+n2)\
- );
- if(len&1)
-@@ -88,6 +87,8 @@
- "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
- "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t"
- "movsd "MANGLE(ff_pd_1)", %%xmm2 \n\t"
-+ :: "m"(*ff_pd_1) );
-+ __asm__ volatile(
- "1: \n\t"
- "movapd (%4,%0), %%xmm3 \n\t"
- "movupd -8(%5,%0), %%xmm4 \n\t"
-@@ -116,6 +117,8 @@
- __asm__ volatile(
- "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
- "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t"
-+ :: "m"(*ff_pd_1) );
-+ __asm__ volatile(
- "1: \n\t"
- "movapd (%3,%0), %%xmm3 \n\t"
- "movupd -8(%4,%0), %%xmm4 \n\t"
More information about the vlc-devel
mailing list