diff options
| author |  wm4 <wm4@nowhere> | 2015-06-05 18:59:13 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-05 18:59:13 +0200 |
| commit | 54b6389873210d06c86c0d3bda4e9ca48a1c094d (patch) | |
| tree | 186c1a8a7c3befb622c5a60414d611b4f444f581 /video/filter | |
| parent | b68627ed2b441f92648409d14a540b2ecac993de (diff) | |
vf_sub: minor simplification
Diffstat (limited to 'video/filter')
| -rw-r--r-- | video/filter/vf.h | 3 | ||||
| -rw-r--r-- | video/filter/vf_sub.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index 76835528b5..62734c99cf 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -144,13 +144,12 @@ enum vf_ctrl { VFCTRL_SEEK_RESET = 1, // reset on picture and PTS discontinuities VFCTRL_SET_EQUALIZER, // set color options (brightness,contrast etc) VFCTRL_GET_EQUALIZER, // get color options (brightness,contrast etc) - VFCTRL_INIT_OSD, // Filter OSD renderer present? VFCTRL_SET_DEINTERLACE, // Set deinterlacing status VFCTRL_GET_DEINTERLACE, // Get deinterlacing status VFCTRL_GET_METADATA, // Get frame metadata from lavfi filters (e.g., cropdetect) /* Hack to make the OSD state object available to vf_sub which * access OSD/subtitle state outside of normal OSD draw time. */ - VFCTRL_SET_OSD_OBJ, + VFCTRL_INIT_OSD, }; struct vf_chain *vf_new(struct mpv_global *global); diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c index 775d9449e5..20069ee1b1 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -121,10 +121,8 @@ static int query_format(struct vf_instance *vf, unsigned int fmt) static int control(vf_instance_t *vf, int request, void *data) { switch (request) { - case VFCTRL_SET_OSD_OBJ: - vf->priv->osd = data; - return CONTROL_TRUE; case VFCTRL_INIT_OSD: + vf->priv->osd = data; return CONTROL_TRUE; } return CONTROL_UNKNOWN; |