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 /libhb/module.defs | |
| 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 'libhb/module.defs')
| -rw-r--r-- | libhb/module.defs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index e5c5650fa..bb7ffccb5 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,6 +1,6 @@ __deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \ LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \ - MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY + MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.GCC,LIBHB)) @@ -37,6 +37,9 @@ LIBHB.out += $(LIBHB.a) ifeq (1,$(FEATURE.ff.mpeg2)) LIBHB.GCC.D += USE_FF_MPEG2 endif +ifeq (1,$(FEATURE.fdk_aac)) +LIBHB.GCC.D += USE_FDK_AAC +endif LIBHB.GCC.D += __LIBHB__ USE_PTHREAD LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include @@ -92,10 +95,15 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - a52 ass avcodec avformat avutil avresample dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \ + fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ $(CONTRIB.build/)lib/lib$(n).a ) +ifeq (1,$(FEATURE.fdk_aac)) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a +endif + ifneq ($(HAS.iconv),1) LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a else |