summaryrefslogtreecommitdiffstats
path: root/video/filter/vf_sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-07 19:33:38 +0100
committerwm4 <wm4@nowhere>2013-12-07 19:33:38 +0100
commit37fbef2ccb3c828dd41f6e15ccf635e697e4011f (patch)
treecb3ff81605d7aa6ea147ba7b24fc2e310b83d04f /video/filter/vf_sub.c
parent0af9ede5466fa5b02348d5cfb3182f80771a5f38 (diff)
downloadmpv-37fbef2ccb3c828dd41f6e15ccf635e697e4011f.tar.bz2
mpv-37fbef2ccb3c828dd41f6e15ccf635e697e4011f.tar.xz
video/filter: make vf->control non-recursive
Reason: I never liked it being recursive. Generally, this seems to cause more problems than trouble, and is less flexible for access outside of the chain.
Diffstat (limited to 'video/filter/vf_sub.c')
-rw-r--r--video/filter/vf_sub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index 34f22e02ce..bd2ab88fd0 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -120,11 +120,11 @@ static int control(vf_instance_t *vf, int request, void *data)
switch (request) {
case VFCTRL_SET_OSD_OBJ:
vf->priv->osd = data;
- break;
+ return CONTROL_TRUE;
case VFCTRL_INIT_OSD:
return CONTROL_TRUE;
}
- return vf_next_control(vf, request, data);
+ return CONTROL_UNKNOWN;
}
static int vf_open(vf_instance_t *vf)