Mercurial > mplayer.hg
changeset 19312:ab8d6b6deb63
proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
| author | ben |
|---|---|
| date | Fri, 04 Aug 2006 17:01:29 +0000 |
| parents | 0a4df538c136 |
| children | 0792ad01e9bf |
| files | stream/Makefile stream/asf_mmst_streaming.c stream/asf_streaming.c stream/http.c stream/network.c stream/open.c stream/pnm.c stream/stream.c stream/stream_cdda.c stream/stream_dvb.c stream/stream_dvdnav.c stream/stream_livedotcom.c stream/stream_mf.c stream/stream_null.c stream/stream_tv.c stream/tv.c |
| diffstat | 16 files changed, 17 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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.
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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;
--- 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)
--- 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;
--- 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)
--- 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"