diff options
| author | wm4 <wm4@nowhere> | 2013-12-10 19:24:58 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-10 20:07:39 +0100 |
| commit | e6e6b88b6da6c50bd7d7b03df583085d19427986 (patch) | |
| tree | ea7d4c0ac37ff0aba518816a64f8e261bf7b2646 /video/filter/vf.h | |
| parent | 2f46b23d51684eef7cfa2bd5fa5e2892772ca816 (diff) | |
| download | mpv-e6e6b88b6da6c50bd7d7b03df583085d19427986.tar.bz2 mpv-e6e6b88b6da6c50bd7d7b03df583085d19427986.tar.xz | |
video: move VO reinit from filter chain to player
This gets rid of the vf_vo pseudo-filter. It ends the idea of MPlayer's
architecture that the VO is just a (terminating) video filter. It didn't
really work for us with respect to video timing (the "end" of the video
chain isn't really made for video timing, and making it do so would be
awkward), and now we're removing it entirely. We will be able to fix
some things, such as properly draining video on reconfiguration.
Diffstat (limited to 'video/filter/vf.h')
| -rw-r--r-- | video/filter/vf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index a852a245f3..5892247556 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -95,7 +95,10 @@ typedef struct vf_instance { struct vf_chain { int initialized; // 0: no, 1: yes, -1: attempted to, but failed - struct vf_instance *first; + struct vf_instance *first, *last; + + struct mp_image_params output_params; + uint8_t allowed_output_formats[IMGFMT_END - IMGFMT_START]; struct MPOpts *opts; struct mp_hwdec_info *hwdec; @@ -117,7 +120,6 @@ enum vf_ctrl { /* 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_SET_VO, }; struct vf_chain *vf_new(struct MPOpts *opts); |