[MPlayer-cvslog] r21783 - in trunk/libmpdemux: Makefile demuxer.c

[aurel]

Author: aurel
Date: Fri Dec 29 00:44:38 2006
New Revision: 21783

Modified:
   trunk/libmpdemux/Makefile
   trunk/libmpdemux/demuxer.c

Log:
don't compile demux_mpc.c when libmpcdec is disabled

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Fri Dec 29 00:44:38 2006
@@ -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

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Fri Dec 29 00:44:38 2006
@@ -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