Cleanup some include statements

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"
 

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)
 {

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
 

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"
 

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"

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"
 

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)

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

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"

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 {

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;

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.

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"
 

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"