OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump ffmpeg from 22950 to 25082
[handbrake-jp/handbrake-jp-git.git]
/
contrib
/
ffmpeg
/
module.defs
diff --git
a/contrib/ffmpeg/module.defs
b/contrib/ffmpeg/module.defs
index
7b96168
..
82d4be7
100644
(file)
--- 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))
$(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-r2
2950
.tar.bz2
+FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r2
5082
.tar.bz2
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.env =
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.env =
@@
-14,12
+14,13
@@
FFMPEG.CONFIGURE.extra = \
--disable-ffserver \
--disable-muxers \
--disable-network \
--disable-ffserver \
--disable-muxers \
--disable-network \
+ --disable-vaapi \
+ --disable-dxva2 \
--enable-bzlib \
--enable-encoder=ac3 \
--enable-encoder=mpeg4 \
--enable-encoder=snow \
--enable-gpl \
--enable-bzlib \
--enable-encoder=ac3 \
--enable-encoder=mpeg4 \
--enable-encoder=snow \
--enable-gpl \
- --enable-libfaad \
--enable-muxer=ipod \
--enable-zlib \
--cc="$(FFMPEG.GCC.gcc)" \
--enable-muxer=ipod \
--enable-zlib \
--cc="$(FFMPEG.GCC.gcc)" \