diff options
| author | wm4 <wm4@nowhere> | 2013-11-23 22:08:42 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-23 22:08:42 +0100 |
| commit | f99aff1b31a7b23e7761a6da4fc4550d698e06fe (patch) | |
| tree | b039e3ef1ef379860d934c1eed0a7a94ef70d444 /mpvcore/player | |
| parent | 36744a30fbeaf5ea8eed1944650acb12cde9ff48 (diff) | |
| download | mpv-f99aff1b31a7b23e7761a6da4fc4550d698e06fe.tar.bz2 mpv-f99aff1b31a7b23e7761a6da4fc4550d698e06fe.tar.xz | |
Reduce stheader.h includes, move stream types to mp_common.h
Diffstat (limited to 'mpvcore/player')
| -rw-r--r-- | mpvcore/player/main.c | 1 | ||||
| -rw-r--r-- | mpvcore/player/misc.c | 1 | ||||
| -rw-r--r-- | mpvcore/player/mp_core.h | 3 | ||||
| -rw-r--r-- | mpvcore/player/osd.c | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c index 84b5aa2651..1e56cf3084 100644 --- a/mpvcore/player/main.c +++ b/mpvcore/player/main.c @@ -53,6 +53,7 @@ #include "audio/decode/dec_audio.h" #include "audio/out/ao.h" #include "audio/mixer.h" +#include "demux/demux.h" #include "stream/stream.h" #include "sub/ass_mp.h" #include "sub/sub.h" diff --git a/mpvcore/player/misc.c b/mpvcore/player/misc.c index 5f15ca7124..e54381d2e2 100644 --- a/mpvcore/player/misc.c +++ b/mpvcore/player/misc.c @@ -36,6 +36,7 @@ #include "mpvcore/input/input.h" #include "audio/out/ao.h" +#include "demux/demux.h" #include "stream/stream.h" #include "video/out/vo.h" diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h index 0be7e1df1f..c1fbf737f3 100644 --- a/mpvcore/player/mp_core.h +++ b/mpvcore/player/mp_core.h @@ -21,9 +21,8 @@ #include <stdbool.h> -#include "compat/compiler.h" +#include "mpvcore/mp_common.h" #include "mpvcore/options.h" -#include "demux/demux.h" // definitions used internally by the core player code diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c index 6f81deae2e..afb04c837a 100644 --- a/mpvcore/player/osd.c +++ b/mpvcore/player/osd.c @@ -35,6 +35,7 @@ #include "osdep/getch2.h" #include "osdep/timer.h" +#include "demux/demux.h" #include "sub/sub.h" #include "mp_core.h" |