[MPlayer-cvslog] CVS: main/libmpdemux Makefile, 1.103, 1.104 demux_mkv.c, 1.60, 1.61 demuxer.c, 1.222, 1.223 ebml.c, 1.6, 1.7

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv26059/libmpdemux

Modified Files:
	Makefile demux_mkv.c demuxer.c ebml.c 
Log Message:
Unconditionally compile the Matroska demuxer.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- Makefile	18 Apr 2006 14:41:41 -0000	1.103
+++ Makefile	8 May 2006 21:41:15 -0000	1.104
@@ -86,6 +86,7 @@
         demux_viv.c \
         demux_vqf.c \
         demux_y4m.c \
+        demux_mkv.c ebml.c \
 
 ifeq ($(HAVE_DVD),yes)
 SRCS += stream_dvd.c
@@ -96,9 +97,6 @@
 ifneq ($(W32_LIB),)
 SRCS += demux_avs.c
 endif
-ifeq ($(MATROSKA),yes)
-SRCS += demux_mkv.c ebml.c
-endif
 
 # Muxers
 MUXERS = muxer.c \

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- demux_mkv.c	24 Apr 2006 07:20:34 -0000	1.60
+++ demux_mkv.c	8 May 2006 21:41:15 -0000	1.61
@@ -7,7 +7,6 @@
  */
 
 #include "config.h"
-#ifdef HAVE_MATROSKA
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -3618,5 +3617,3 @@
   demux_mkv_seek,
   demux_mkv_control
 };
-
-#endif /* HAVE_MATROSKA */

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- demuxer.c	27 Apr 2006 11:13:21 -0000	1.222
+++ demuxer.c	8 May 2006 21:41:15 -0000	1.223
@@ -81,9 +81,7 @@
   &demuxer_desc_nuv,
   &demuxer_desc_real,
   &demuxer_desc_smjpeg,
-#ifdef HAVE_MATROSKA
   &demuxer_desc_matroska,
-#endif
   &demuxer_desc_realaudio,
   &demuxer_desc_vqf,
   &demuxer_desc_mov,

Index: ebml.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ebml.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebml.c	13 Jul 2005 17:24:42 -0000	1.6
+++ ebml.c	8 May 2006 21:41:15 -0000	1.7
@@ -6,7 +6,6 @@
  */
 
 #include "config.h"
-#ifdef HAVE_MATROSKA
 
 #include <stdlib.h>
 
@@ -363,5 +362,3 @@
 
   return str;
 }
-
-#endif /* HAVE_MATROSKA */