[Mplayer-cvslog] CVS: main/TOOLS/netstream Makefile, 1.1, 1.2 netstream.c, 1.4, 1.5

[Gabucino]

CVS change done by Gabucino

Update of /cvsroot/mplayer/main/TOOLS/netstream
In directory mail:/var2/tmp/cvs-serv3399

Modified Files:
	Makefile netstream.c 
Log Message:
- Cleaned up the Makefile, added some *.o's
- Added some declarations of variable's in netstream.c

Patch by Anton Verburg <anton at frog.nl>


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/netstream/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Apr 2003 16:39:16 -0000	1.1
+++ Makefile	17 Feb 2004 11:22:32 -0000	1.2
@@ -17,7 +17,7 @@
 
 
 netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o
-	$(CC) $(CFLAGS) -g netstream.o $(MPROOT)/mp_msg.c $(MPROOT)/osdep/shmem.c -o netstream $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdvdkit2/libmpdvdkit.a $(MPROOT)/libvo/aclib.o $(MPROOT)/libmpcodecs/img_format.o $(MPROOT)/libao2/afmt.o $(MPROOT)/sub_cc.o $(MPROOT)/m_option.o $(MPROOT)/m_struct.o $(MPROOT)/subreader.o $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
+	$(CC) $(CFLAGS) netstream.o -o netstream $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdvdkit2/libmpdvdkit.a $(MPROOT)/libmpcodecs/native/minilzo.o $(MPROOT)/libvo/aclib.o $(MPROOT)/libmpcodecs/img_format.o $(MPROOT)/libao2/afmt.o $(MPROOT)/m_option.o $(MPROOT)/m_struct.o $(MPROOT)/subreader.o $(MPROOT)/mp_msg.o $(MPROOT)/osdep/shmem.o $(MPROOT)/osdep/timer-*.o $(VORBIS_LIB) $(CDPARANOIA_LIB) -lpthread -lsmbclient -lungif 
 
 clean:
 	rm -f *.o *.a *~

Index: netstream.c
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/netstream/netstream.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netstream.c	14 Aug 2003 12:15:41 -0000	1.4
+++ netstream.c	17 Feb 2004 11:22:32 -0000	1.5
@@ -47,6 +47,12 @@
 /// Netstream packets def and some helpers
 #include <libmpdemux/netstream.h>
 
+
+//Set some standard variables
+char* dvdsub_lang=NULL;
+char* audio_lang=NULL;
+int sub_justify=0;
+
 static unsigned short int port = 10000;
 
 typedef struct client_st client_t;