diff options
| author | konablend <[email protected]> | 2009-06-23 23:19:28 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-06-23 23:19:28 +0000 |
| commit | a05dbea22e8d056bea0984887236207579f7af6c (patch) | |
| tree | 06516c6f19a7a24834035994fa0e13dae8b7294b | |
| parent | bba625a1a3ea9328b9d3060bf52af3100b80ee5f (diff) | |
- added FFMPEG dependencies markers { BZIP2, ZLIB }; needed for mingw/cygwin platforms.
- explicitly enable { bzlib, zlib } during configure phase.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2608 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/ffmpeg/module.defs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index fd8ad7433..2f6e633d4 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,FAAD2)) +$(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-r19067.tar.bz2 @@ -6,8 +6,6 @@ FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r19067.tar.b FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = FFMPEG.CONFIGURE.host = -#FFMPEG.CONFIGURE.shared = -#FFMPEG.CONFIGURE.static = FFMPEG.CONFIGURE.extra = \ --disable-bsfs \ @@ -16,12 +14,14 @@ FFMPEG.CONFIGURE.extra = \ --disable-ffserver \ --disable-muxers \ --disable-network \ + --enable-bzlib \ --enable-encoder=ac3 \ --enable-encoder=mpeg4 \ --enable-encoder=snow \ --enable-gpl \ --enable-libfaad \ --enable-muxer=ipod \ + --enable-zlib \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" |