Mercurial > mplayer.hg
changeset 31430:a2c6762a9adc
Move noconfig_opts extern variable declaration to mpcommon.h.
| author | diego |
|---|---|
| date | Sun, 20 Jun 2010 18:19:47 +0000 |
| parents | b542cd25f03d |
| children | 29c120a9caad |
| files | cfg-common.h mpcommon.h |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sun Jun 20 17:58:37 2010 +0000 +++ b/cfg-common.h Sun Jun 20 18:19:47 2010 +0000 @@ -44,6 +44,7 @@ #include "stream/tcp.h" #include "stream/udp.h" #include "codec-cfg.h" +#include "mpcommon.h" #ifdef CONFIG_CDDA #include "stream/cdd.h" @@ -301,8 +302,6 @@ }; -extern const m_option_t noconfig_opts[]; - extern const m_option_t lavc_decode_opts_conf[]; extern const m_option_t xvid_dec_opts[];
--- a/mpcommon.h Sun Jun 20 17:58:37 2010 +0000 +++ b/mpcommon.h Sun Jun 20 18:19:47 2010 +0000 @@ -19,6 +19,7 @@ #ifndef MPLAYER_MPCOMMON_H #define MPLAYER_MPCOMMON_H +#include "m_option.h" #include "subreader.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" @@ -28,6 +29,8 @@ extern ass_track_t *ass_track; extern subtitle *vo_sub_last; +extern const m_option_t noconfig_opts[]; + void print_version(const char* name); void update_subtitles(sh_video_t *sh_video, double refpts, demux_stream_t *d_dvdsub, int reset); void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);