diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 09:49:25 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:48:38 +0300 |
| commit | c510959da57b20a316d388661c4a873d27c4dc8f (patch) | |
| tree | d2e6ee6aff1f14e16b1086bc19f84fcad17fa06d /libmpdemux | |
| parent | 66bd120a3a8c15ee3bd7ce41e7258e8b33925864 (diff) | |
| download | mpv-c510959da57b20a316d388661c4a873d27c4dc8f.tar.bz2 mpv-c510959da57b20a316d388661c4a873d27c4dc8f.tar.xz | |
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.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.h | 5 | ||||
| -rw-r--r-- | libmpdemux/stheader.h | 9 |
2 files changed, 4 insertions, 10 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); diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index a81f349c02..88d02506e0 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -1,7 +1,6 @@ #ifndef MPLAYER_STHEADER_H #define MPLAYER_STHEADER_H -#include "demuxer.h" #include "aviheader.h" #include "ms_hdr.h" struct MPOpts; @@ -11,7 +10,7 @@ struct MPOpts; typedef struct sh_audio { struct MPOpts *opts; int aid; - demux_stream_t *ds; + struct demux_stream *ds; struct codecs_st *codec; unsigned int format; int initialized; @@ -59,7 +58,7 @@ typedef struct sh_audio { typedef struct sh_video { struct MPOpts *opts; int vid; - demux_stream_t *ds; + struct demux_stream *ds; struct codecs_st *codec; unsigned int format; int initialized; @@ -109,9 +108,7 @@ typedef struct sh_sub { int forced_subs_only; unsigned char* extradata; // extra header data passed from demuxer int extradata_len; -#ifdef USE_ASS - ass_track_t* ass_track; // for SSA/ASS streams (type == 'a') -#endif + struct ass_track_s *ass_track; // for SSA/ASS streams (type == 'a') char* lang; // track language int default_track; } sh_sub_t; |