summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/module.defs
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-03-03 16:18:16 +0000
committerjstebbins <[email protected]>2013-03-03 16:18:16 +0000
commit288639e626b5c550fdd33e49abf1b8e3a3fcd52e (patch)
tree0df5c1da8728a0706110984b675a0d3b7a350ba9 /contrib/ffmpeg/module.defs
parentb56a9d0fc23ca64f1d63afb797bdc07e1dffc357 (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/ffmpeg/module.defs')
-rw-r--r--contrib/ffmpeg/module.defs9
1 files changed, 8 insertions, 1 deletions
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