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 /test | |
| 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 'test')
| -rw-r--r-- | test/module.defs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/module.defs b/test/module.defs index 7898a86ed..2150ed906 100644 --- a/test/module.defs +++ b/test/module.defs @@ -14,7 +14,7 @@ TEST.GCC.L = $(CONTRIB.build/)lib TEST.libs = $(LIBHB.a) TEST.GCC.l = \ - a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \ + a52 ass avcodec avformat avutil avresample dvdnav dvdread \ fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \ samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \ bluray xml2 bz2 z @@ -23,6 +23,10 @@ ifeq (1,$(FEATURE.fdk_aac)) TEST.GCC.l += fdk-aac endif +ifeq (1,$(FEATURE.faac)) +TEST.GCC.l += faac +endif + TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) ############################################################################### |