Commit 2871ee78 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: added Google's libvpx patch for ffmpeg with a couple of compilation...

contribs: added Google's libvpx patch for ffmpeg with a couple of compilation fixes for Mac OS X and added another patch for libvpx
parent 9b88eef6
...@@ -1078,6 +1078,7 @@ else ...@@ -1078,6 +1078,7 @@ else
ffmpeg: ffmpeg:
endif endif
$(SVN) co $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
(cd ffmpeg; patch -p0 < ../Patches/ffmpeg-libvpx.patch;)
ifdef HAVE_ISA_THUMB ifdef HAVE_ISA_THUMB
patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
endif endif
...@@ -1116,7 +1117,7 @@ else ...@@ -1116,7 +1117,7 @@ else
ifdef HAVE_WIN32 ifdef HAVE_WIN32
FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
else else
FFMPEGCONFG += --enable-pthreads FFMPEGCONF += --enable-pthreads
endif endif
endif endif
......
This diff is collapsed.
...@@ -11,3 +11,16 @@ ...@@ -11,3 +11,16 @@
# check system headers # check system headers
check_header stdint.h check_header stdint.h
check_header pthread.h check_header pthread.h
--- vpx/vpx_ports/vpx_integer.h 2010-05-18 17:58:33.000000000 +0200
+++ vpx_fixed/vpx_ports/vpx_integer.h 2010-05-23 01:41:37.000000000 +0200
@@ -43,10 +43,6 @@
typedef signed char int_fast8_t;
typedef unsigned char uint_fast8_t;
-#ifndef _UINTPTR_T_DEFINED
-typedef unsigned int uintptr_t;
-#endif
-
#endif
#endif
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