diff options
| -rw-r--r-- | command.h | 3 | ||||
| -rw-r--r-- | fmt-conversion.h | 3 | ||||
| -rw-r--r-- | m_option.h | 2 | ||||
| -rw-r--r-- | m_property.h | 2 | ||||
| -rw-r--r-- | mp_core.h | 8 | ||||
| -rw-r--r-- | mpbswap.h | 1 | ||||
| -rw-r--r-- | mpcommon.h | 4 | ||||
| -rw-r--r-- | parser-cfg.h | 2 | ||||
| -rw-r--r-- | parser-mecmd.h | 2 | ||||
| -rw-r--r-- | parser-mpcmd.h | 3 | ||||
| -rw-r--r-- | playtreeparser.h | 2 |
11 files changed, 31 insertions, 1 deletions
@@ -1,6 +1,9 @@ #ifndef MPLAYER_COMMAND_H #define MPLAYER_COMMAND_H +#include "mp_core.h" +#include "input/input.h" + int run_command(struct MPContext *mpctx, mp_cmd_t *cmd); char *property_expand_string(struct MPContext *mpctx, char *str); void property_print_help(void); diff --git a/fmt-conversion.h b/fmt-conversion.h index 86121f584d..b27803eea3 100644 --- a/fmt-conversion.h +++ b/fmt-conversion.h @@ -1,8 +1,9 @@ #ifndef MPLAYER_FMT_CONVERSION_H #define MPLAYER_FMT_CONVERSION_H +#include <stdio.h> #include "libavutil/avutil.h" -#include "img_format.h" +#include "libmpcodecs/img_format.h" enum PixelFormat imgfmt2pixfmt(int fmt) { diff --git a/m_option.h b/m_option.h index d6b9cd0331..13451390db 100644 --- a/m_option.h +++ b/m_option.h @@ -1,6 +1,8 @@ #ifndef MPLAYER_M_OPTION_H #define MPLAYER_M_OPTION_H +#include <string.h> + /// \defgroup Options /// m_option allows to parse, print and copy data of various types. /// It is the base of the \ref OptionsStruct, \ref Config and diff --git a/m_property.h b/m_property.h index 3bf8be55dc..7bf43289e9 100644 --- a/m_property.h +++ b/m_property.h @@ -1,6 +1,8 @@ #ifndef MPLAYER_M_PROPERTY_H #define MPLAYER_M_PROPERTY_H +#include "m_option.h" + /// \defgroup Properties /// /// Properties provide an interface to query and set the state of various @@ -2,6 +2,14 @@ #define MPLAYER_MP_CORE_H #include "mp_osd.h" +#include "libao2/audio_out.h" +#include "playtree.h" +#include "stream/stream.h" +#include "libmpdemux/demuxer.h" +#include "libmpdemux/stheader.h" +#include "mixer.h" +#include "libvo/video_out.h" +#include "subreader.h" // definitions used internally by the core player code @@ -1,6 +1,7 @@ #ifndef MPLAYER_MPBSWAP_H #define MPLAYER_MPBSWAP_H +#include <sys/types.h> #include "libavutil/bswap.h" #ifndef HAVE_SWAB void swab(const void *from, void *to, ssize_t n); diff --git a/mpcommon.h b/mpcommon.h index fbffeec386..0fbb612cdb 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -1,6 +1,10 @@ #ifndef MPLAYER_MPCOMMON_H #define MPLAYER_MPCOMMON_H +#include "subreader.h" +#include "libmpdemux/demuxer.h" +#include "libmpdemux/stheader.h" + extern double sub_last_pts; extern struct ass_track_s *ass_track; extern subtitle *vo_sub_last; diff --git a/parser-cfg.h b/parser-cfg.h index f1867c52d0..852a68f697 100644 --- a/parser-cfg.h +++ b/parser-cfg.h @@ -1,6 +1,8 @@ #ifndef MPLAYER_PARSER_CFG_H #define MPLAYER_PARSER_CFG_H +#include "m_config.h" + int m_config_parse_config_file(m_config_t* config, char *conffile); #endif /* MPLAYER_PARSER_CFG_H */ diff --git a/parser-mecmd.h b/parser-mecmd.h index aeb96d94ca..a7f5b33bff 100644 --- a/parser-mecmd.h +++ b/parser-mecmd.h @@ -1,6 +1,8 @@ #ifndef MPLAYER_PARSER_MECMD_H #define MPLAYER_PARSER_MECMD_H +#include "m_config.h" + /// \file /// \ingroup ConfigParsers MEntry /// \brief A simple parser with per-entry settings. diff --git a/parser-mpcmd.h b/parser-mpcmd.h index e86c363042..bcee4db882 100644 --- a/parser-mpcmd.h +++ b/parser-mpcmd.h @@ -1,6 +1,9 @@ #ifndef MPLAYER_PARSER_MPCMD_H #define MPLAYER_PARSER_MPCMD_H +#include "playtree.h" +#include "m_config.h" + play_tree_t* m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv); #endif /* MPLAYER_PARSER_MPCMD_H */ diff --git a/playtreeparser.h b/playtreeparser.h index 52701179e4..f0e11a6970 100644 --- a/playtreeparser.h +++ b/playtreeparser.h @@ -1,6 +1,8 @@ #ifndef MPLAYER_PLAYTREEPARSER_H #define MPLAYER_PLAYTREEPARSER_H +#include "playtree.h" + /// \defgroup PlaytreeParser Playtree parser /// \ingroup Playtree /// |