From cb45b1c65b2fe4644342db202e5f7b9fb64f2488 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 12 Jul 2013 22:04:44 +0200 Subject: Cleanup some include statements --- stream/stream_avdevice.c | 1 - stream/stream_bluray.c | 7 ++++--- stream/stream_cdda.c | 1 - stream/stream_dvb.c | 1 - stream/stream_lavf.c | 1 - stream/stream_mf.c | 1 - stream/stream_pvr.c | 5 +++-- stream/stream_tv.c | 1 - stream/stream_vcd.c | 2 -- stream/tv.h | 4 +--- 10 files changed, 8 insertions(+), 16 deletions(-) (limited to 'stream') diff --git a/stream/stream_avdevice.c b/stream/stream_avdevice.c index bd342e1b10..eca5a6637a 100644 --- a/stream/stream_avdevice.c +++ b/stream/stream_avdevice.c @@ -19,7 +19,6 @@ #include "config.h" #include "stream.h" -#include "demux/demux.h" static int fill_buffer(stream_t *s, char *buffer, int max_len) { diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 131813dbb2..505dafd5a9 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -29,18 +29,19 @@ * */ -#include #include #include +#include +#include + #include "config.h" -#include "libavutil/common.h" -#include "demux/demux.h" #include "talloc.h" #include "core/mp_msg.h" #include "core/m_struct.h" #include "core/m_option.h" #include "stream.h" +#include "demux/stheader.h" #define BLURAY_SECTOR_SIZE 6144 diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index f5b36a9419..18855918ad 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -44,7 +44,6 @@ #include "core/m_struct.h" #include "libavutil/common.h" #include "compat/mpbswap.h" -#include "demux/demux.h" #include "cdd.h" diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 3847e26c75..6dbdf7b0b9 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include "stream.h" -#include "demux/demux.h" #include "core/m_option.h" #include "core/m_struct.h" #include "core/path.h" diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 8a146a986d..d0e7017b4d 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -26,7 +26,6 @@ #include "stream.h" #include "core/m_option.h" #include "core/m_struct.h" -#include "demux/demux.h" #include "cookies.h" diff --git a/stream/stream_mf.c b/stream/stream_mf.c index 9354005ae4..4e560da2f4 100644 --- a/stream/stream_mf.c +++ b/stream/stream_mf.c @@ -26,7 +26,6 @@ #include #include "stream.h" -#include "demux/demux.h" static int mf_stream_open (stream_t *stream, int mode, void *opts) diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c index 165a67ad37..0b5f188c9e 100644 --- a/stream/stream_pvr.c +++ b/stream/stream_pvr.c @@ -40,14 +40,15 @@ #include #include +#include +#include + #include "core/mp_msg.h" #include "stream.h" #include "pvr.h" #include "frequencies.h" -#include "libavutil/common.h" -#include "libavutil/avstring.h" #define PVR_DEFAULT_DEVICE "/dev/video0" #define PVR_MAX_CONTROLS 10 diff --git a/stream/stream_tv.c b/stream/stream_tv.c index eacdabd705..937a299211 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -26,7 +26,6 @@ #include #include "stream.h" -#include "demux/demux.h" #include "core/m_option.h" #include "core/m_struct.h" #include "tv.h" diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index fbbae12266..a8b7924030 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -51,8 +51,6 @@ #include "vcd_read.h" #endif -#include "demux/demux.h" - extern char *cdrom_device; static struct stream_priv_s { diff --git a/stream/tv.h b/stream/tv.h index 660a78be7b..ded9ace6c8 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -25,8 +25,6 @@ #ifndef MPLAYER_TV_H #define MPLAYER_TV_H -#include "demux/demux.h" - typedef struct tv_param_s { char *freq; char *channel; @@ -105,7 +103,7 @@ typedef struct tvi_handle_s { const tvi_functions_t *functions; void *priv; int seq; - demuxer_t *demuxer; + struct demuxer *demuxer; /* specific */ int norm; -- cgit v1.2.3