diff options
| author | jstebbins <[email protected]> | 2013-06-15 17:24:35 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-06-15 17:24:35 +0000 |
| commit | 768561ada96cd0149ed115748c95a32357676b38 (patch) | |
| tree | f3133420c26ba3955476aaab30e829555745e57b /libhb/module.defs | |
| parent | c0a3e42fcb044932defaa420ce9ecaeed54db9a3 (diff) | |
improve aac encoder build options and change some aac encoder defaults
By default, faac is no longer built.
Libav aac is now the default aac encoder on all platforms except osx
where ca_aac is the default.
fdk-aac is now built by default (except on osx).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5581 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/module.defs')
| -rw-r--r-- | libhb/module.defs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index bb7ffccb5..bd300bafb 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -40,6 +40,12 @@ endif ifeq (1,$(FEATURE.fdk_aac)) LIBHB.GCC.D += USE_FDK_AAC endif +ifeq (1,$(FEATURE.libav_aac)) +LIBHB.GCC.D += USE_LIBAV_AAC +endif +ifeq (1,$(FEATURE.faac)) +LIBHB.GCC.D += USE_FAAC +endif LIBHB.GCC.D += __LIBHB__ USE_PTHREAD LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include @@ -104,6 +110,10 @@ ifeq (1,$(FEATURE.fdk_aac)) LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a endif +ifeq (1,$(FEATURE.faac)) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libfaac.a +endif + ifneq ($(HAS.iconv),1) LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a else |