diff options
author | wm4 <wm4@nowhere> | 2014-06-10 23:06:42 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-11 00:39:13 +0200 |
commit | f9f89b90499f34b04a355fd366433e9f27063358 (patch) | |
tree | 30939a34748da0aae0b79abb721e5e1cbdd46693 /options | |
parent | 099cdbf019424b6096aebd45b8ca68bc29068e70 (diff) | |
download | mpv-f9f89b90499f34b04a355fd366433e9f27063358.tar.bz2 mpv-f9f89b90499f34b04a355fd366433e9f27063358.tar.xz |
demux_raw: remove global option variables
Diffstat (limited to 'options')
-rw-r--r-- | options/options.c | 10 | ||||
-rw-r--r-- | options/options.h | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/options/options.c b/options/options.c index b02be333d3..c9a3a59203 100644 --- a/options/options.c +++ b/options/options.c @@ -43,10 +43,6 @@ #include "player/command.h" #include "osdep/priority.h" -/* defined in demux: */ -extern const m_option_t demux_rawaudio_opts[]; -extern const m_option_t demux_rawvideo_opts[]; - extern const char mp_help_text[]; static void print_version(struct mp_log *log) @@ -64,6 +60,8 @@ extern const struct m_sub_options stream_pvr_conf; extern const struct m_sub_options stream_cdda_conf; extern const struct m_sub_options stream_dvb_conf; extern const struct m_sub_options sws_conf; +extern const struct m_sub_options demux_rawaudio_conf; +extern const struct m_sub_options demux_rawvideo_conf; extern const m_option_t lavfdopts_conf[]; @@ -283,8 +281,8 @@ const m_option_t mp_opts[] = { {"ad-lavc", (void *) ad_lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG}, {"demuxer-lavf", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG}, - {"demuxer-rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG}, - {"demuxer-rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG}, + OPT_SUBSTRUCT("demuxer-rawaudio", demux_rawaudio, demux_rawaudio_conf, 0), + OPT_SUBSTRUCT("demuxer-rawvideo", demux_rawvideo, demux_rawvideo_conf, 0), OPT_FLAG("demuxer-mkv-subtitle-preroll", mkv_subtitle_preroll, 0), OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0), // old alias diff --git a/options/options.h b/options/options.h index dbddd52c4d..6aed93f8c7 100644 --- a/options/options.h +++ b/options/options.h @@ -256,6 +256,9 @@ typedef struct MPOpts { double mf_fps; char *mf_type; + struct demux_rawaudio_opts *demux_rawaudio; + struct demux_rawvideo_opts *demux_rawvideo; + struct lavc_param { int fast; int show_all; |