summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 22:04:44 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:16:26 +0200
commitcb45b1c65b2fe4644342db202e5f7b9fb64f2488 (patch)
tree9fce4ba5cbbf0278387937cef8ec7f9d2ca8d2fe
parent3269bd178020c5d821e8b2d1fd807a38d63e93ce (diff)
downloadmpv-cb45b1c65b2fe4644342db202e5f7b9fb64f2488.tar.bz2
mpv-cb45b1c65b2fe4644342db202e5f7b9fb64f2488.tar.xz
Cleanup some include statements
-rw-r--r--core/asxparser.c1
-rw-r--r--stream/stream_avdevice.c1
-rw-r--r--stream/stream_bluray.c7
-rw-r--r--stream/stream_cdda.c1
-rw-r--r--stream/stream_dvb.c1
-rw-r--r--stream/stream_lavf.c1
-rw-r--r--stream/stream_mf.c1
-rw-r--r--stream/stream_pvr.c5
-rw-r--r--stream/stream_tv.c1
-rw-r--r--stream/stream_vcd.c2
-rw-r--r--stream/tv.h4
-rw-r--r--sub/osd_libass.c2
-rw-r--r--video/decode/dec_video.c4
-rw-r--r--video/decode/vd.c1
14 files changed, 10 insertions, 22 deletions
diff --git a/core/asxparser.c b/core/asxparser.c
index 0fc10eb059..ec15313547 100644
--- a/core/asxparser.c
+++ b/core/asxparser.c
@@ -27,7 +27,6 @@
#include "playlist.h"
#include "playlist_parser.h"
#include "stream/stream.h"
-#include "demux/demux.h"
#include "asxparser.h"
#include "core/mp_msg.h"
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 <libbluray/bluray.h>
#include <string.h>
#include <assert.h>
+#include <libbluray/bluray.h>
+#include <libavutil/common.h>
+
#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 <errno.h>
#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 <string.h>
#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 <linux/types.h>
#include <linux/videodev2.h>
+#include <libavutil/common.h>
+#include <libavutil/avstring.h>
+
#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 <string.h>
#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;
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index cbf9466780..fc4592ef99 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -34,7 +34,7 @@ static const char osd_font_pfb[] =
;
#include "sub/ass_mp.h"
-#include "core/mp_core.h"
+#include "core/options.h"
// NOTE: \fs-5 to reduce the size of the symbols in relation to normal text.
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index ed856e046c..d101237699 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -24,14 +24,12 @@
#include <stdbool.h>
#include <assert.h>
-#include "demux/codec_tags.h"
-
#include "core/mp_msg.h"
#include "osdep/timer.h"
#include "stream/stream.h"
-#include "demux/demux.h"
+#include "demux/demux_packet.h"
#include "core/codecs.h"
diff --git a/video/decode/vd.c b/video/decode/vd.c
index 6f05ab334c..9df1d39146 100644
--- a/video/decode/vd.c
+++ b/video/decode/vd.c
@@ -28,7 +28,6 @@
#include "video/img_format.h"
#include "stream/stream.h"
-#include "demux/demux.h"
#include "demux/stheader.h"
#include "dec_video.h"