[vlc-devel] commit: contrib: fix FFMPEG patching ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Aug 29 19:45:20 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 29 20:44:16 2009 +0300| [92353571547e6678c7fa7f83ef3566cfe59033e7] | committer: Rémi Denis-Courmont 

contrib: fix FFMPEG patching

(cherry picked from commit 87233cf2655e16e5098fcd36ea0e3f526bb99505)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=92353571547e6678c7fa7f83ef3566cfe59033e7
---

 extras/contrib/src/Makefile |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d7c7d40..54411eb 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1095,9 +1095,6 @@ else
 .ffmpeg: ffmpeg .lame .gsm
 endif
 endif
-ifdef HAVE_ISA_THUMB
-	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
-endif
 	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 




More information about the vlc-devel mailing list