Remove some unnecessary recursive includes

Remove some #include lines from headers, some of those removals made
possible by using incomplete struct types instead of typedefs. Include
mp_osd.h in mplayer.c and command.c after removing it from mp_core.h.
Remove "#ifdef USE_ASS" around some "struct ass_track_s *" fields
which will now compile even without ASS support.

1 files changed, 1 insertions, 4 deletions

diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index c61f564eb7..70c6639654 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -6,9 +6,6 @@
 #include <string.h>
 
 #include "stream/stream.h"
-#ifdef USE_ASS
-#include "libass/ass_types.h"
-#endif
 
 struct MPOpts;
 
@@ -108,7 +105,7 @@ typedef struct demux_packet_st {
   struct demux_packet_st* next;
 } demux_packet_t;
 
-typedef struct {
+typedef struct demux_stream {
   int buffer_pos;          // current buffer position
   int buffer_size;         // current buffer size
   unsigned char* buffer;   // current buffer, never free() it, always use free_demux_packet(buffer_ref);