Mercurial > mplayer.hg
changeset 11964:d051cf39331e
- Cleaned up the Makefile, added some *.o's
- Added some declarations of variable's in netstream.c
Patch by Anton Verburg <anton@frog.nl>
| author | gabucino |
|---|---|
| date | Tue, 17 Feb 2004 11:22:32 +0000 |
| parents | 43c79660dbbe |
| children | 3d75bcc28231 |
| files | TOOLS/netstream/Makefile TOOLS/netstream/netstream.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/TOOLS/netstream/Makefile Tue Feb 17 00:57:08 2004 +0000 +++ b/TOOLS/netstream/Makefile Tue Feb 17 11:22:32 2004 +0000 @@ -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 *~
--- a/TOOLS/netstream/netstream.c Tue Feb 17 00:57:08 2004 +0000 +++ b/TOOLS/netstream/netstream.c Tue Feb 17 11:22:32 2004 +0000 @@ -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;