summaryrefslogtreecommitdiffstats
path: root/libhb/Makefile
diff options
context:
space:
mode:
authormaurj <[email protected]>2007-05-02 15:56:39 +0000
committermaurj <[email protected]>2007-05-02 15:56:39 +0000
commit7800f22f054d4a96731c94bc71310c09a2b8235f (patch)
treeccee5caab83f8bda1057985f71145ef83bbfb0be /libhb/Makefile
parent3a55755f5bd2fb02d5e87f100b83f81e61f7bf82 (diff)
Added support for DTS audio. DTS audio streams (of 5.1 audio and below) will be detected and decoded. This requires a new library - libdca (and patch) - which is included (in patched form) in a new version of the pre-built UB Darwin contribs (0012). These have been uploaded to download.m0k.org/handbrake/contrib/ .
I haven't yet added any code to Controller.mm to recognise the DTS streams as supporting mono / 6ch DPL1 / DPL2 downmixes. Note: running Jam on the new library required me to update some tools on Mac OS X - possibly libtool, autoconf, automake. Not sure which made the difference, but these were the ones I updated. it won't jam successfully without this. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@559 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/Makefile')
-rw-r--r--libhb/Makefile38
1 files changed, 18 insertions, 20 deletions
diff --git a/libhb/Makefile b/libhb/Makefile
index 902877561..6604ec428 100644
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -22,33 +22,31 @@ ifeq ($(SYSTEM),Linux)
endif
SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c \
- update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c \
- muxmp4.c sync.c decsub.c deca52.c encfaac.c declpcm.c encx264.c \
- decavcodec.c encxvid.c muxavi.c enclame.c muxogm.c encvorbis.c \
- dvd.c ipodutil.cpp
+ update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c \
+ muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
+ decavcodec.c encxvid.c muxavi.c enclame.c muxogm.c encvorbis.c \
+ dvd.c ipodutil.cpp
OTMP = $(SRCS:%.c=%.o)
OBJS = $(OTMP:%.cpp=%.o)
ifeq ($(SYSTEM),CYGWIN_NT-5.1)
CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
- ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
- ../contrib/lib/libdvdread.a \
- ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \
- ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \
- ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \
- ../contrib/lib/libvorbisfile.a ../contrib/lib/libogg.a \
- ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \
- ../contrib/lib/libxvidcore.a ../contrib/lib/libmp4v2.a
+ ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
+ ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a \
+ ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \
+ ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \
+ ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \
+ ../contrib/lib/libvorbisfile.a ../contrib/lib/libogg.a \
+ ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \
+ ../contrib/lib/libxvidcore.a ../contrib/lib/libmp4v2.a
else
CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
- ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
- ../contrib/lib/libdvdread.a ../contrib/lib/libdvdcss.a \
- ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \
- ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \
- ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \
- ../contrib/lib/libvorbisfile.a ../contrib/lib/libogg.a \
- ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \
- ../contrib/lib/libxvidcore.a ../contrib/lib/libmp4v2.a
+ ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
+ ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a \
+ ../contrib/lib/libdvdcss.a ../contrib/lib/libfaac.a \
+ ../contrib/lib/libmp3lame.a ../contrib/lib/libmpeg2.a \ ../contrib/lib/libmpeg2convert.a ../contrib/lib/libvorbis.a \ ../contrib/lib/libvorbisenc.a ../contrib/lib/libvorbisfile.a \ ../contrib/lib/libogg.a ../contrib/lib/libsamplerate.a \
+ ../contrib/lib/libx264.a ../contrib/lib/libxvidcore.a \
+ ../contrib/lib/libmp4v2.a
endif
CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)