Author: diego Date: Sun Jun 20 20:19:47 2010 New Revision: 31496 Log: Move noconfig_opts extern variable declaration to mpcommon.h. Modified: trunk/cfg-common.h trunk/mpcommon.h Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Jun 20 19:58:37 2010 (r31495) +++ trunk/cfg-common.h Sun Jun 20 20:19:47 2010 (r31496) @@ -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 @@ const m_option_t msgl_config[]={ }; -extern const m_option_t noconfig_opts[]; - extern const m_option_t lavc_decode_opts_conf[]; extern const m_option_t xvid_dec_opts[]; Modified: trunk/mpcommon.h ============================================================================== --- trunk/mpcommon.h Sun Jun 20 19:58:37 2010 (r31495) +++ trunk/mpcommon.h Sun Jun 20 20:19:47 2010 (r31496) @@ -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 double sub_last_pts; 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);