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 /gtk | |
| 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 'gtk')
| -rw-r--r-- | gtk/configure.ac | 10 | ||||
| -rw-r--r-- | gtk/module.defs | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index 6d013f935..64aa72744 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -60,6 +60,10 @@ AC_ARG_ENABLE(fdk-aac, AS_HELP_STRING([--enable-fdk-aac], [enable fdk aac encoder]), use_fdk_aac=yes, use_fdk_aac=no) +AC_ARG_ENABLE(faac, + AS_HELP_STRING([--enable-faac], [enable faac encoder]), + use_faac=yes, use_faac=no) + AC_ARG_ENABLE(gst, AS_HELP_STRING([--disable-gst], [disable gstreamer (live preview)]), gst_disable=yes, gst_disable=no) @@ -203,12 +207,16 @@ case $host in ;; esac -HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" +HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" if test "x$use_fdk_aac" = "xyes" ; then HB_LIBS+=" -lfdk-aac" fi +if test "x$use_faac" = "xyes" ; then + HB_LIBS+=" -lfaac" +fi + AC_SUBST(HB_LIBS) AC_SUBST(GHB_TOOLS_CFLAGS) AC_SUBST(GHB_TOOLS_LIBS) diff --git a/gtk/module.defs b/gtk/module.defs index 8eddc6d91..cee9d7790 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -32,3 +32,7 @@ endif ifeq (1,$(FEATURE.fdk_aac)) GTK.CONFIGURE.extra += --enable-fdk-aac endif + +ifeq (1,$(FEATURE.faac)) + GTK.CONFIGURE.extra += --enable-faac +endif |