[MPlayer-cvslog] r19318 - in trunk/stream: Makefile asf_mmst_streaming.c asf_streaming.c http.c network.c open.c pnm.c stream.c stream_cdda.c stream_dvb.c stream_dvdnav.c stream_livedotcom.c stream_mf.c stream_null.c stream_tv.c tv.c

[ben]

Author: ben
Date: Fri Aug  4 19:01:29 2006
New Revision: 19318

Modified:
   trunk/stream/Makefile
   trunk/stream/asf_mmst_streaming.c
   trunk/stream/asf_streaming.c
   trunk/stream/http.c
   trunk/stream/network.c
   trunk/stream/open.c
   trunk/stream/pnm.c
   trunk/stream/stream.c
   trunk/stream/stream_cdda.c
   trunk/stream/stream_dvb.c
   trunk/stream/stream_dvdnav.c
   trunk/stream/stream_livedotcom.c
   trunk/stream/stream_mf.c
   trunk/stream/stream_null.c
   trunk/stream/stream_tv.c
   trunk/stream/tv.c

Log:
proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)

Modified: trunk/stream/Makefile
==============================================================================
--- trunk/stream/Makefile	(original)
+++ trunk/stream/Makefile	Fri Aug  4 19:01:29 2006
@@ -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

Modified: trunk/stream/asf_mmst_streaming.c
==============================================================================
--- trunk/stream/asf_mmst_streaming.c	(original)
+++ trunk/stream/asf_mmst_streaming.c	Fri Aug  4 19:01:29 2006
@@ -37,7 +37,7 @@
 #endif
 
 #include "url.h"
-#include "asf.h"
+#include "libmpdemux/asf.h"
 
 #include "stream.h"
 

Modified: trunk/stream/asf_streaming.c
==============================================================================
--- trunk/stream/asf_streaming.c	(original)
+++ trunk/stream/asf_streaming.c	Fri Aug  4 19:01:29 2006
@@ -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"
 

Modified: trunk/stream/http.c
==============================================================================
--- trunk/stream/http.c	(original)
+++ trunk/stream/http.c	Fri Aug  4 19:01:29 2006
@@ -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"
 

Modified: trunk/stream/network.c
==============================================================================
--- trunk/stream/network.c	(original)
+++ trunk/stream/network.c	Fri Aug  4 19:01:29 2006
@@ -27,7 +27,7 @@
 #endif
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "m_config.h"
 
 #include "network.h"

Modified: trunk/stream/open.c
==============================================================================
--- trunk/stream/open.c	(original)
+++ trunk/stream/open.c	Fri Aug  4 19:01:29 2006
@@ -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.

Modified: trunk/stream/pnm.c
==============================================================================
--- trunk/stream/pnm.c	(original)
+++ trunk/stream/pnm.c	Fri Aug  4 19:01:29 2006
@@ -45,7 +45,7 @@
 #endif
 
 #include "stream.h"
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 #include "help_mp.h"
 #include "osdep/timer.h"
 

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	(original)
+++ trunk/stream/stream.c	Fri Aug  4 19:01:29 2006
@@ -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"

Modified: trunk/stream/stream_cdda.c
==============================================================================
--- trunk/stream/stream_cdda.c	(original)
+++ trunk/stream/stream_cdda.c	Fri Aug  4 19:01:29 2006
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "demuxer.h"
+#include "libmpdemux/demuxer.h"
 
 #include "cdd.h"
 

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	(original)
+++ trunk/stream/stream_dvb.c	Fri Aug  4 19:01:29 2006
@@ -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"

Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c	(original)
+++ trunk/stream/stream_dvdnav.c	Fri Aug  4 19:01:29 2006
@@ -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"

Modified: trunk/stream/stream_livedotcom.c
==============================================================================
--- trunk/stream/stream_livedotcom.c	(original)
+++ trunk/stream/stream_livedotcom.c	Fri Aug  4 19:01:29 2006
@@ -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;

Modified: trunk/stream/stream_mf.c
==============================================================================
--- trunk/stream/stream_mf.c	(original)
+++ trunk/stream/stream_mf.c	Fri Aug  4 19:01:29 2006
@@ -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)

Modified: trunk/stream/stream_null.c
==============================================================================
--- trunk/stream/stream_null.c	(original)
+++ trunk/stream/stream_null.c	Fri Aug  4 19:01:29 2006
@@ -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;

Modified: trunk/stream/stream_tv.c
==============================================================================
--- trunk/stream/stream_tv.c	(original)
+++ trunk/stream/stream_tv.c	Fri Aug  4 19:01:29 2006
@@ -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)

Modified: trunk/stream/tv.c
==============================================================================
--- trunk/stream/tv.c	(original)
+++ trunk/stream/tv.c	Fri Aug  4 19:01:29 2006
@@ -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"