X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fffmpeg%2Fmodule.defs;h=82d4be780af10baddf8b85c60240fc1f070cb930;hb=b7049e6e4712ced6f3347dd64f376eca98f97b72;hp=b47ebdda49af6ce5c959ce964413a64e4394b402;hpb=106aac3c7212b03d8bcdd6d871026a7510b317ed;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index b47ebdda..82d4be78 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 FAAD2 ZLIB))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r20602.tar.bz2
+FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r25082.tar.bz2
 
 FFMPEG.CONFIGURE.deps =
 FFMPEG.CONFIGURE.env  =
@@ -14,12 +14,13 @@ FFMPEG.CONFIGURE.extra = \
     --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)" \
@@ -32,12 +33,13 @@ ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.GCC.args.extra = -fno-common
 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