summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-04 23:11:35 +0100
committerwm4 <wm4@nowhere>2013-12-04 23:13:46 +0100
commite9f49ea84de06e657067c16d9f43d531ef22b062 (patch)
tree0921837a1fc10326e2509c241700ae44c08608d0 /video
parent193930ac3b1cffb65782f7db9b611c09cf48f9f0 (diff)
downloadmpv-e9f49ea84de06e657067c16d9f43d531ef22b062.tar.bz2
mpv-e9f49ea84de06e657067c16d9f43d531ef22b062.tar.xz
options: remove legacy hacks for sub-option handling
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c
index c88621afdb..100b9d241b 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -266,27 +266,18 @@ error:
vf_instance_t *vf_open_filter(struct MPOpts *opts, vf_instance_t *next,
const char *name, char **args)
{
- if (args && strcmp(args[0], "_oldargs_")) {
+ if (strcmp(name, "vo") != 0) {
int i, l = 0;
for (i = 0; args && args[2 * i]; i++)
l += 1 + strlen(args[2 * i]) + 1 + strlen(args[2 * i + 1]);
l += strlen(name);
- {
- char str[l + 1];
- char *p = str;
- p += sprintf(str, "%s", name);
- for (i = 0; args && args[2 * i]; i++)
- p += sprintf(p, " %s=%s", args[2 * i], args[2 * i + 1]);
- mp_msg(MSGT_VFILTER, MSGL_INFO, "%s[%s]\n",
- mp_gtext("Opening video filter: "), str);
- }
- } else if (strcmp(name, "vo")) {
- if (args && strcmp(args[0], "_oldargs_") == 0)
- mp_msg(MSGT_VFILTER, MSGL_INFO, "%s[%s=%s]\n",
- mp_gtext("Opening video filter: "), name, args[1]);
- else
- mp_msg(MSGT_VFILTER, MSGL_INFO, "%s[%s]\n",
- mp_gtext("Opening video filter: "), name);
+ char str[l + 1];
+ char *p = str;
+ p += sprintf(str, "%s", name);
+ for (i = 0; args && args[2 * i]; i++)
+ p += sprintf(p, " %s=%s", args[2 * i], args[2 * i + 1]);
+ mp_msg(MSGT_VFILTER, MSGL_INFO, "%s[%s]\n",
+ "Opening video filter: ", str);
}
return vf_open(opts, next, name, args);
}