From e3809e5b52619692ba91fcd3e857cbf335f43d1a Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 5 Dec 2013 22:55:09 +0100 Subject: vf_sub, vf_dlopen: default struct is not needed --- video/filter/vf_dlopen.c | 5 ++--- video/filter/vf_sub.c | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'video/filter') diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c index 5f41c427a9..2378b84674 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -44,7 +44,7 @@ # define DLLSymbol(handle, name) dlsym(handle, name) #endif -static struct vf_priv_s { +struct vf_priv_s { char *cfg_dllname; int cfg_argc; char *cfg_argv[16]; @@ -69,7 +69,7 @@ static struct vf_priv_s { unsigned int outfmt; int argc; -} const vf_priv_dflt = {}; +}; struct fmtname { const char *name; @@ -379,7 +379,6 @@ const vf_info_t vf_info_dlopen = { .name = "dlopen", .open = vf_open, .priv_size = sizeof(struct vf_priv_s), - .priv_defaults = &vf_priv_dflt, .options = vf_opts_fields, }; diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c index 643339c4eb..34f22e02ce 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -42,15 +42,13 @@ #include "mpvcore/m_option.h" -static const struct vf_priv_s { +struct vf_priv_s { int opt_top_margin, opt_bottom_margin; int outh, outw; struct osd_state *osd; struct mp_osd_res dim; -} vf_priv_dflt = { - 0 }; static int config(struct vf_instance *vf, @@ -150,6 +148,5 @@ const vf_info_t vf_info_sub = { .name = "sub", .open = vf_open, .priv_size = sizeof(struct vf_priv_s), - .priv_defaults = &vf_priv_dflt, .options = vf_opts_fields, }; -- cgit v1.2.3