diff options
| author | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-17 11:22:32 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-17 11:22:32 +0000 |
| commit | dd4befd76fd2e8a4c30681f8dae17186065cc8c8 (patch) | |
| tree | 245babaf0fd833b4c1787d20d838e46bab9aed76 /TOOLS | |
| parent | 901201b954729fd44d2cb91c1abb575e3b87e9a5 (diff) | |
| download | mpv-dd4befd76fd2e8a4c30681f8dae17186065cc8c8.tar.bz2 mpv-dd4befd76fd2e8a4c30681f8dae17186065cc8c8.tar.xz | |
- Cleaned up the Makefile, added some *.o's
- Added some declarations of variable's in netstream.c
Patch by Anton Verburg <anton@frog.nl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11965 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/netstream/Makefile | 2 | ||||
| -rw-r--r-- | TOOLS/netstream/netstream.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index e8b1bac200..3bc75e1c50 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -17,7 +17,7 @@ all: netstream 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 *~ diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream/netstream.c index e81e346861..a974ecf532 100644 --- a/TOOLS/netstream/netstream.c +++ b/TOOLS/netstream/netstream.c @@ -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; |