diff options
| author | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
| commit | 288639e626b5c550fdd33e49abf1b8e3a3fcd52e (patch) | |
| tree | 0df5c1da8728a0706110984b675a0d3b7a350ba9 /contrib | |
| parent | b56a9d0fc23ca64f1d63afb797bdc07e1dffc357 (diff) | |
Add optional fdk-aac encoder
configure --enable-fdk-aac to enable this encoder
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5287 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fdk-aac/module.defs | 5 | ||||
| -rw-r--r-- | contrib/fdk-aac/module.rules | 2 | ||||
| -rw-r--r-- | contrib/ffmpeg/module.defs | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/contrib/fdk-aac/module.defs b/contrib/fdk-aac/module.defs new file mode 100644 index 000000000..628e0c52b --- /dev/null +++ b/contrib/fdk-aac/module.defs @@ -0,0 +1,5 @@ +$(eval $(call import.MODULE.defs,FDKAAC,fdkaac)) +$(eval $(call import.CONTRIB.defs,FDKAAC)) + +FDKAAC.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fdk-aac-v0.1.1-6-gbae4553.tar.bz2 + diff --git a/contrib/fdk-aac/module.rules b/contrib/fdk-aac/module.rules new file mode 100644 index 000000000..b46629e4f --- /dev/null +++ b/contrib/fdk-aac/module.rules @@ -0,0 +1,2 @@ +$(eval $(call import.MODULE.rules,FDKAAC)) +$(eval $(call import.CONTRIB.rules,FDKAAC)) diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 0be57e997..2f7ba282a 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB)) +$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC)) $(eval $(call import.CONTRIB.defs,FFMPEG)) FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.2.tar.bz2 @@ -31,6 +31,13 @@ FFMPEG.CONFIGURE.extra = \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" +ifeq (1,$(FEATURE.fdk_aac)) +FFMPEG.CONFIGURE.extra += \ + --enable-nonfree \ + --enable-libfdk-aac \ + --enable-encoder=libfdk_aac +endif + ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system)) FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack |