From 654930aa47e10c07aa0399f515a8dd04d34efa3a Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 11 Jun 2014 01:46:20 +0200 Subject: demux_lavf: make option struct local Similar to previous commits. --- options/options.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index 3875a38c89..c494a23dd3 100644 --- a/options/options.c +++ b/options/options.c @@ -62,11 +62,10 @@ 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 struct m_sub_options demux_lavf_conf; extern const struct m_sub_options vd_lavc_conf; extern const struct m_sub_options ad_lavc_conf; -extern const m_option_t lavfdopts_conf[]; - extern const struct m_obj_list vf_obj_list; extern const struct m_obj_list af_obj_list; extern const struct m_obj_list vo_obj_list; @@ -279,7 +278,7 @@ const m_option_t mp_opts[] = { OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0), OPT_SUBSTRUCT("ad-lavc", ad_lavc_params, ad_lavc_conf, 0), - {"demuxer-lavf", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG}, + OPT_SUBSTRUCT("demuxer-lavf", demux_lavf, demux_lavf_conf, 0), OPT_SUBSTRUCT("demuxer-rawaudio", demux_rawaudio, demux_rawaudio_conf, 0), OPT_SUBSTRUCT("demuxer-rawvideo", demux_rawvideo, demux_rawvideo_conf, 0), @@ -646,9 +645,6 @@ const struct MPOpts mp_default_opts = { .mf_fps = 1.0, - .lavfdopts = { - .allow_mimetype = 1, - }, .input = { .key_fifo_size = 7, .doubleclick_time = 300, -- cgit v1.2.3