From 2410b87a6408d91eb5c8db8d38af5aabfdca4d8a Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 4 Aug 2006 17:01:29 +0000 Subject: proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19318 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/Makefile | 2 +- stream/asf_mmst_streaming.c | 2 +- stream/asf_streaming.c | 4 ++-- stream/http.c | 2 +- stream/network.c | 2 +- stream/open.c | 3 +-- stream/pnm.c | 2 +- stream/stream.c | 2 +- stream/stream_cdda.c | 2 +- stream/stream_dvb.c | 2 +- stream/stream_dvdnav.c | 2 +- stream/stream_livedotcom.c | 2 +- stream/stream_mf.c | 2 +- stream/stream_null.c | 1 - stream/stream_tv.c | 2 +- stream/tv.c | 4 ++-- 16 files changed, 17 insertions(+), 19 deletions(-) (limited to 'stream') diff --git a/stream/Makefile b/stream/Makefile index c5a3898a0d..72ad1a0ce9 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -110,7 +110,7 @@ SRCS += dvb_tune.c 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 --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index ae1bb58509..baad3c9493 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -37,7 +37,7 @@ #endif #include "url.h" -#include "asf.h" +#include "libmpdemux/asf.h" #include "stream.h" diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index 0ba53bfb23..1446c44f6d 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -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 --git a/stream/http.c b/stream/http.c index ce7738427a..753075cc3d 100644 --- a/stream/http.c +++ b/stream/http.c @@ -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 --git a/stream/network.c b/stream/network.c index d9e18f7e94..0ef302ffe8 100644 --- a/stream/network.c +++ b/stream/network.c @@ -27,7 +27,7 @@ #endif #include "stream.h" -#include "demuxer.h" +#include "libmpdemux/demuxer.h" #include "m_config.h" #include "network.h" diff --git a/stream/open.c b/stream/open.c index 5fcfa5b508..0ec0222c32 100644 --- a/stream/open.c +++ b/stream/open.c @@ -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 --git a/stream/pnm.c b/stream/pnm.c index 033772d8d9..b3c0b35279 100644 --- a/stream/pnm.c +++ b/stream/pnm.c @@ -45,7 +45,7 @@ #endif #include "stream.h" -#include "demuxer.h" +#include "libmpdemux/demuxer.h" #include "help_mp.h" #include "osdep/timer.h" diff --git a/stream/stream.c b/stream/stream.c index 78647f02fa..3c59d4cbb0 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -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 --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 2757f8ccab..42d2713b51 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -7,7 +7,7 @@ #include #include -#include "demuxer.h" +#include "libmpdemux/demuxer.h" #include "cdd.h" diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 7fa92e0663..142ce9af7f 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -42,7 +42,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #include "stream.h" -#include "demuxer.h" +#include "libmpdemux/demuxer.h" #include "help_mp.h" #include "m_option.h" #include "m_struct.h" diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 35412a4667..ea3dce1efb 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -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 --git a/stream/stream_livedotcom.c b/stream/stream_livedotcom.c index 51f6e72fa3..db7f2d8fc1 100644 --- a/stream/stream_livedotcom.c +++ b/stream/stream_livedotcom.c @@ -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 --git a/stream/stream_mf.c b/stream/stream_mf.c index b2e64901da..89a734d2f9 100644 --- a/stream/stream_mf.c +++ b/stream/stream_mf.c @@ -23,7 +23,7 @@ #include #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 --git a/stream/stream_null.c b/stream/stream_null.c index 93492e63a6..70221482d4 100644 --- a/stream/stream_null.c +++ b/stream/stream_null.c @@ -5,7 +5,6 @@ #include #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 --git a/stream/stream_tv.c b/stream/stream_tv.c index 8275c630c9..de1c48f72f 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -23,7 +23,7 @@ #include #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 --git a/stream/tv.c b/stream/tv.c index 74ac7e39fc..e4161e67c1 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -25,8 +25,8 @@ int tv_param_on = 0; #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" -- cgit v1.2.3