[vlc-devel] commit: contrib: update ffmpeg used for 0.9.5 to version of today. ( Derk-Jan Hartman )

[git version control]

vlc | branch: 0.9-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Fri Oct 10 23:11:19 2008 +0200| [13072b33afc0e9da42108b07cf78ebba2071352d] | committer: Derk-Jan Hartman 

contrib: update ffmpeg used for 0.9.5 to version of today.

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

 extras/contrib/src/Makefile                        |    5 +----
 .../contrib/src/Patches/ffmpeg-altivec-fix.patch   |   12 ------------
 2 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 15b8154..8f2471b 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1056,7 +1056,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 15261
+	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 15594
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1069,9 +1069,6 @@ endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
-ifdef HAVE_DARWIN_OS
-	(cd $@; patch -p1 < ../Patches/ffmpeg-altivec-fix.patch)
-endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
diff --git a/extras/contrib/src/Patches/ffmpeg-altivec-fix.patch b/extras/contrib/src/Patches/ffmpeg-altivec-fix.patch
deleted file mode 100644
index 43bffce..0000000
--- a/extras/contrib/src/Patches/ffmpeg-altivec-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libavcodec/ppc/check_altivec.c b/libavcodec/ppc/check_altivec.c
-index 932c218..f88b276 100644
---- a/libavcodec/ppc/check_altivec.c
-+++ b/libavcodec/ppc/check_altivec.c
-@@ -23,6 +23,7 @@
-  */
- 
- #ifdef __APPLE__
-+#undef _POSIX_C_SOURCE
- #include <sys/sysctl.h>
- #elif __AMIGAOS4__
- #include <exec/exec.h>