Commit 13072b33 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

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

parent 738491f7
......@@ -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/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>
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