vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Mar 18 21:41:16 2011 +0100| [8f6ca154e617f48897f7138739d34fc694982b7d] | committer: Felix Paul Kühne
contribs: fixed typo in previous commit > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8f6ca154e617f48897f7138739d34fc694982b7d --- extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch | 74 -------------------- extras/contrib/src/contrib-src.mak | 4 +- 2 files changed, 2 insertions(+), 76 deletions(-) diff --git a/extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch b/extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch deleted file mode 100644 index 9fd6900..0000000 --- a/extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm -index afe6426..dbe6b8a 100644 ---- a/libavcodec/x86/h264_intrapred.asm -+++ b/libavcodec/x86/h264_intrapred.asm -@@ -1249,7 +1249,10 @@ cglobal pred8x8l_horizontal_%1, 4,4 - sub r0, r3 - lea r2, [r0+r3*2] - movq mm0, [r0+r3*1-8] -- punpckhbw mm0, [r0+r3*0-8] -+ test r1, r1 -+ lea r1, [r0+r3] -+ cmovnz r1, r0 -+ punpckhbw mm0, [r1+r3*0-8] - movq mm1, [r2+r3*1-8] - punpckhbw mm1, [r0+r3*2-8] - mov r2, r0 -@@ -1264,21 +1267,12 @@ cglobal pred8x8l_horizontal_%1, 4,4 - punpckhdq mm3, mm1 - lea r0, [r0+r3*2] - movq mm0, [r0+r3*0-8] -- movq mm1, [r2] -+ movq mm1, [r1+r3*0-8] - mov r0, r2 - movq mm4, mm3 - movq mm2, mm3 - PALIGNR mm4, mm0, 7, mm0 - PALIGNR mm1, mm2, 1, mm2 -- test r1, r1 ; top_left -- jnz .do_left --.fix_lt_1: -- movq mm5, mm3 -- pxor mm5, mm4 -- psrlq mm5, 56 -- psllq mm5, 48 -- pxor mm1, mm5 --.do_left: - movq mm0, mm4 - PRED4x4_LOWPASS mm2, mm1, mm4, mm3, mm5 - movq mm4, mm0 -@@ -2153,7 +2147,10 @@ cglobal pred8x8l_horizontal_up_%1, 4,4 - sub r0, r3 - lea r2, [r0+r3*2] - movq mm0, [r0+r3*1-8] -- punpckhbw mm0, [r0+r3*0-8] -+ test r1, r1 -+ lea r1, [r0+r3] -+ cmovnz r1, r0 -+ punpckhbw mm0, [r1+r3*0-8] - movq mm1, [r2+r3*1-8] - punpckhbw mm1, [r0+r3*2-8] - mov r2, r0 -@@ -2168,21 +2165,12 @@ cglobal pred8x8l_horizontal_up_%1, 4,4 - punpckhdq mm3, mm1 - lea r0, [r0+r3*2] - movq mm0, [r0+r3*0-8] -- movq mm1, [r2] -+ movq mm1, [r1+r3*0-8] - mov r0, r2 - movq mm4, mm3 - movq mm2, mm3 - PALIGNR mm4, mm0, 7, mm0 - PALIGNR mm1, mm2, 1, mm2 -- test r1, r1 -- jnz .do_left --.fix_lt_1: -- movq mm5, mm3 -- pxor mm5, mm4 -- psrlq mm5, 56 -- psllq mm5, 48 -- pxor mm1, mm5 --.do_left: - movq mm0, mm4 - PRED4x4_LOWPASS mm2, mm1, mm4, mm3, mm5 - movq mm4, mm0 diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index 9a52b70..0264ce5 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -890,7 +890,7 @@ VPX_DEPS-$(ENABLED) = VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm .libvpx: libvpx $(VPX_DEPS-1) -# (cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET-1) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-install-docs --disable-examples --disable-vp8-decoder && make && make install) + (cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET-1) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-install-docs --disable-examples --disable-vp8-decoder && make && make install) (rm -rf $(PREFIX)/include/vpx/ && mkdir -p $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install? rm $(PREFIX)/include/vpx/config.h (cd $<; $(RANLIB) libvpx.a && mkdir -p $(PREFIX)/lib && cp libvpx.a $(PREFIX)/lib/) # Of course, why the hell would one expect it to be listed or in make install? @@ -1088,7 +1088,7 @@ endif PHONY += ffmpeg-svn ffmpeg-tar ffmpeg/.svn: -# $(SVN) co $(FFMPEG_SVN) ffmpeg + $(SVN) co $(FFMPEG_SVN) ffmpeg ifdef HAVE_ISA_THUMB patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
