bump ffmpeg from git-185a155 to git-0b32da9

[handbrake-jp/handbrake-jp-git.git] / contrib / ffmpeg / module.defs

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 2f36ee9..40c3200 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,25 +1,27 @@
-$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 FAAD2 ZLIB))
+$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 ZLIB))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r19067.tar.bz2
+FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/ffmpeg-git-0b32da9.tar.bz2
 
 FFMPEG.CONFIGURE.deps =
 FFMPEG.CONFIGURE.env  =
 FFMPEG.CONFIGURE.host =
 
 FFMPEG.CONFIGURE.extra = \
+    --disable-doc \
     --disable-bsfs \
     --disable-encoders \
     --disable-ffmpeg \
     --disable-ffserver \
     --disable-muxers \
     --disable-network \
+    --disable-vaapi \
+    --disable-dxva2 \
     --enable-bzlib \
     --enable-encoder=ac3 \
     --enable-encoder=mpeg4 \
     --enable-encoder=snow \
     --enable-gpl \
-    --enable-libfaad \
     --enable-muxer=ipod \
     --enable-zlib \
     --cc="$(FFMPEG.GCC.gcc)" \
@@ -30,14 +32,15 @@ FFMPEG.CONFIGURE.extra = \
 ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack
     FFMPEG.GCC.args.extra = -fno-common
-else ifeq (1-darwin,$(BUILD.cross)-$(BUILD.system))
+else ifeq (darwin,$(BUILD.system))
     ## section for darwin-archs
-    FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine)
+    FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine) --target-os=darwin
 else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.CONFIGURE.extra += \
         --enable-w32threads \
         --enable-memalign-hack \
         --target-os=mingw32 \
+        --arch=i386 \
         --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
     FFMPEG.GCC.args.extra += -fno-common
 else