Mercurial > mplayer.hg

changeset 21767:ff8dbfde335e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't compile demux_mpc.c when libmpcdec is disabled
author aurel
date Thu, 28 Dec 2006 23:44:38 +0000
parents d380216661af
children f665d42cd019
files libmpdemux/Makefile libmpdemux/demuxer.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/Makefile	Thu Dec 28 23:32:26 2006 +0000
+++ b/libmpdemux/Makefile	Thu Dec 28 23:44:38 2006 +0000
@@ -21,7 +21,6 @@
         demux_mf.c \
         demux_mkv.c ebml.c \
         demux_mov.c \
-        demux_mpc.c \
         demux_mpg.c \
         demux_nsv.c \
         demux_nuv.c \
@@ -55,6 +54,7 @@
 SRCS-$(LIBDV)                   += demux_rawdv.c
 SRCS-$(LIBNUT)                  += demux_nut.c
 SRCS-$(LIBVORBIS)               += demux_ogg.c
+SRCS-$(MUSEPACK)                += demux_mpc.c
 SRCS-$(STREAMING_LIVE555)       += demux_rtp.cpp demux_rtp_codec.cpp
 SRCS-$(WIN32DLL)                += demux_avs.c
 SRCS-$(XMMS_PLUGINS)            += demux_xmms.c
--- a/libmpdemux/demuxer.c	Thu Dec 28 23:32:26 2006 +0000
+++ b/libmpdemux/demuxer.c	Thu Dec 28 23:44:38 2006 +0000
@@ -106,7 +106,9 @@
   &demuxer_desc_mpeg_gxf,
   &demuxer_desc_mpeg4_es,
   &demuxer_desc_h264_es,
+#ifdef MUSEPACK
   &demuxer_desc_mpc,
+#endif
   &demuxer_desc_audio,
   &demuxer_desc_mpeg_ty,
 #ifdef STREAMING_LIVE555