[Mplayer-cvslog] CVS: main Makefile,1.78,1.79 codec-cfg.c,1.41,1.42 codec-cfg.h,1.18,1.19 configure,1.192,1.193

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv5363

Modified Files:
	Makefile codec-cfg.c codec-cfg.h configure 
Log Message:
libdemuxer...

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- Makefile	19 Oct 2001 02:00:45 -0000	1.78
+++ Makefile	20 Oct 2001 18:49:08 -0000	1.79
@@ -16,13 +16,13 @@
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
 # BINDIR = /usr/local/bin
-SRCS = cpudetect.c postproc/swscale.c postproc/postprocess.c mp_msg.c open.c parse_es.c ac3-iec958.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demux_mov.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
+SRCS = cpudetect.c postproc/swscale.c postproc/postprocess.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c spudec.c
 OBJS = $(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
 VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
 
-PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb
+PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb
 ifeq ($(GUI),yes)
 PARTS += Gui
 endif
@@ -50,11 +50,14 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMONLIBS = libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a encore/libencore.a
+COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a encore/libencore.a
 
 loader/libloader.a:
 	$(MAKE) -C loader
 
+libmpdemux/libmpdemux.a:
+	$(MAKE) -C libmpdemux
+
 loader/DirectShow/libDS_Filter.a:
 	$(MAKE) -C loader/DirectShow
 
@@ -93,7 +96,7 @@
 	@for a in $(PARTS); do $(MAKE) -C $$a all ; done
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(VO_LIBS) $(CSS_LIB) -Lencore -lencore $(DECORE_LIBS) $(GUI_LIBS) $(ARCH_LIBS)
+	$(CC) $(CFLAGS) -o $(PRG) mplayer.o -Llibmpdemux -lmpdemux $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(VO_LIBS) $(CSS_LIB) -Lencore -lencore $(DECORE_LIBS) $(GUI_LIBS) $(ARCH_LIBS)
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- codec-cfg.c	2 Oct 2001 22:37:28 -0000	1.41
+++ codec-cfg.c	20 Oct 2001 18:49:08 -0000	1.42
@@ -18,7 +18,7 @@
 // for mmioFOURCC:
 #include "wine/avifmt.h"
 
-#include "libvo/img_format.h"
+#include "../libvo/img_format.h"
 #include "codec-cfg.h"
 
 #define PRINT_LINENUM printf(" at line %d\n", line_num)

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- codec-cfg.h	27 Sep 2001 12:59:35 -0000	1.18
+++ codec-cfg.h	20 Oct 2001 18:49:08 -0000	1.19
@@ -51,7 +51,7 @@
 #endif
 
 
-typedef struct {
+typedef struct codecs_st {
 	unsigned int fourcc[CODECS_MAX_FOURCC];
 	unsigned int fourccmap[CODECS_MAX_FOURCC];
 	unsigned int outfmt[CODECS_MAX_OUTFMT];

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- configure	17 Oct 2001 18:17:50 -0000	1.192
+++ configure	20 Oct 2001 18:49:08 -0000	1.193
@@ -1734,7 +1734,7 @@
 
 _streamingdef='#undef STREAMING'
 if test "$_streaming" = yes ; then
-   _streamingsrcs='asf_streaming.c network.c url.c http.c'
+#   _streamingsrcs='asf_streaming.c network.c url.c http.c'
    _streamingdef='#define STREAMING'
 fi
 
@@ -2271,7 +2271,7 @@
 ALSA_LIB = $_alsalib
 ESD_LIB = $_esdlib
 ARCH_LIBS = $_archlibs $_iconvlib
-STREAM_SRCS = $_streamingsrcs
+STREAMING=$_streaming
 DECORE_LIBS = $_decorelibs
 DIVX4LINUX=$_divx4linux
 MLIB_INC = $_mlibinc