X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fffmpeg%2Fmodule.defs;h=bca90571fdf6de9d5c780f2ed874a1c1354dfaa9;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=4ad4a2122a0de7c879e78faef9f6220756e0bc63;hpb=eb0a7619f7b2056a0603a317a8856f33054af4c9;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 4ad4a212..bca90571 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,13 +1,14 @@
 $(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-r22950.tar.bz2
+FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r25082.tar.bz2
 
 FFMPEG.CONFIGURE.deps =
 FFMPEG.CONFIGURE.env  =
 FFMPEG.CONFIGURE.host =
 
 FFMPEG.CONFIGURE.extra = \
+    --disable-doc \
     --disable-bsfs \
     --disable-encoders \
     --disable-ffmpeg \
@@ -15,12 +16,12 @@ FFMPEG.CONFIGURE.extra = \
     --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)" \