diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-31 17:39:17 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-31 17:39:17 +0000 |
| commit | 49867bd432352d19172ab26cf873bd5651e69e25 (patch) | |
| tree | c2d419bb4f81564036baa12832a44b8aac27c6d1 /TOOLS | |
| parent | d3b998da64927403879ad588287c178f86b7c849 (diff) | |
| download | mpv-49867bd432352d19172ab26cf873bd5651e69e25.tar.bz2 mpv-49867bd432352d19172ab26cf873bd5651e69e25.tar.xz | |
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/Makefile | 2 | ||||
| -rw-r--r-- | TOOLS/netstream/Makefile | 3 | ||||
| -rw-r--r-- | TOOLS/netstream/netstream.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile index 817fe33a23..0433525109 100644 --- a/TOOLS/Makefile +++ b/TOOLS/Makefile @@ -31,7 +31,7 @@ subrip: subrip.c ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm vivodump: vivodump.c - $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a + $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a ../stream/stream.a fastmemcpybench: fastmemcpybench.c $(CC) $(CFLAGS) -g $< -o fastmem-mmx ../libvo/aclib.o -DNAME=\"mmx\" -DHAVE_MMX diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index e07505dde5..1f5173c106 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -19,6 +19,7 @@ all: netstream # FIXME: linking is a mess that should be fixed properly some day # it does not work with either GUI, live.com or libavformat enabled DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \ + $(MPROOT)/stream/stream.a \ $(MPROOT)/libmpdvdkit2/libmpdvdkit.a \ $(MPROOT)/libmpcodecs/native/minilzo.o \ $(MPROOT)/libvo/aclib.o \ @@ -45,7 +46,7 @@ ifeq ($(TARGET_WIN32),yes) DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32 endif -netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o +netstream: $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdemux/stream.a netstream.o $(CC) $(CFLAGS) netstream.o -o netstream $(DEPS) diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream/netstream.c index 73a0bec1d5..0f8b698436 100644 --- a/TOOLS/netstream/netstream.c +++ b/TOOLS/netstream/netstream.c @@ -41,13 +41,13 @@ #include <ws2tcpip.h> #endif -#include <libmpdemux/stream.h> +#include <stream/stream.h> #include <libmpdemux/demuxer.h> #include <mp_msg.h> #include <bswap.h> /// Netstream packets def and some helpers -#include <libmpdemux/netstream.h> +#include <stream/netstream.h> //Set some standard variables |