# HG changeset patch
# User ben
# Date 1154710889 0
# Node ID ab8d6b6deb63a4594fdc878fb187fa1ade54adad
# Parent  0a4df538c136d3c802e0633f06cbf13a44773af5
proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)

diff -r 0a4df538c136 -r ab8d6b6deb63 stream/Makefile
--- a/stream/Makefile	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/Makefile	Fri Aug 04 17:01:29 2006 +0000
@@ -110,7 +110,7 @@
 endif
 
 OBJS	= $(SRCS:.c=.o)
-INCLUDE = -I.. -I../libmpdemux -I../loader $(LIBAV_INC)
+INCLUDE = -I.. -I../loader $(LIBAV_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
 
 .SUFFIXES: .c .o
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/asf_mmst_streaming.c
--- a/stream/asf_mmst_streaming.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/asf_mmst_streaming.c	Fri Aug 04 17:01:29 2006 +0000
@@ -37,7 +37,7 @@
 #endif
 
 #include "url.h"
-#include "asf.h"
+#include "libmpdemux/asf.h"
 
 #include "stream.h"
 
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/asf_streaming.c
--- a/stream/asf_streaming.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/asf_streaming.c	Fri Aug 04 17:01:29 2006 +0000
@@ -17,10 +17,10 @@
 
 #include "url.h"
 #include "http.h"
-#include "asf.h"
+#include "libmpdemux/asf.h"
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 #include "network.h"
 
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/http.c
--- a/stream/http.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/http.c	Fri Aug 04 17:01:29 2006 +0000
@@ -23,7 +23,7 @@
 #include "mp_msg.h"
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "network.h"
 #include "help_mp.h"
 
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/network.c
--- a/stream/network.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/network.c	Fri Aug 04 17:01:29 2006 +0000
@@ -27,7 +27,7 @@
 #endif
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "m_config.h"
 
 #include "network.h"
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/open.c
--- a/stream/open.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/open.c	Fri Aug 04 17:01:29 2006 +0000
@@ -17,8 +17,7 @@
 
 #include "m_option.h"
 #include "stream.h"
-#include "demuxer.h"
-#include "mf.h"
+#include "libmpdemux/demuxer.h"
 
 
 /// We keep these 2 for the gui atm, but they will be removed.
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/pnm.c
--- a/stream/pnm.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/pnm.c	Fri Aug 04 17:01:29 2006 +0000
@@ -45,7 +45,7 @@
 #endif
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "help_mp.h"
 #include "osdep/timer.h"
 
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream.c
--- a/stream/stream.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream.c	Fri Aug 04 17:01:29 2006 +0000
@@ -26,7 +26,7 @@
 #include "osdep/shmem.h"
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_cdda.c
--- a/stream/stream_cdda.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_cdda.c	Fri Aug 04 17:01:29 2006 +0000
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 #include "cdd.h"
 
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_dvb.c
--- a/stream/stream_dvb.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_dvb.c	Fri Aug 04 17:01:29 2006 +0000
@@ -42,7 +42,7 @@
 #include <fcntl.h>
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "help_mp.h"
 #include "m_option.h"
 #include "m_struct.h"
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_dvdnav.c
--- a/stream/stream_dvdnav.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_dvdnav.c	Fri Aug 04 17:01:29 2006 +0000
@@ -8,7 +8,7 @@
 #include "osdep/timer.h"
 #include "input/input.h"
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "stream_dvdnav.h"
 #include "libvo/video_out.h"
 #include "spudec.h"
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_livedotcom.c
--- a/stream/stream_livedotcom.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_livedotcom.c	Fri Aug 04 17:01:29 2006 +0000
@@ -8,7 +8,7 @@
 
 #include "stream.h"
 #include "network.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "help_mp.h"
 
 extern int network_bandwidth;
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_mf.c
--- a/stream/stream_mf.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_mf.c	Fri Aug 04 17:01:29 2006 +0000
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 static int
 mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_null.c
--- a/stream/stream_null.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_null.c	Fri Aug 04 17:01:29 2006 +0000
@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include "stream.h"
-#include "demuxer.h"
 
 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
   stream->type = STREAMTYPE_DUMMY;
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/stream_tv.c
--- a/stream/stream_tv.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/stream_tv.c	Fri Aug 04 17:01:29 2006 +0000
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 static int
 tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
diff -r 0a4df538c136 -r ab8d6b6deb63 stream/tv.c
--- a/stream/tv.c	Fri Aug 04 16:55:48 2006 +0000
+++ b/stream/tv.c	Fri Aug 04 17:01:29 2006 +0000
@@ -25,8 +25,8 @@
 #include "help_mp.h"
 
 #include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "libaf/af_format.h"
 #include "libvo/img_format.h"