diff options
Diffstat (limited to 'video/filter')
-rw-r--r-- | video/filter/vf.c | 5 | ||||
-rw-r--r-- | video/filter/vf.h | 6 | ||||
-rw-r--r-- | video/filter/vf_vo.c | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c index c6c3766baf..294c306448 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -432,7 +432,7 @@ void vf_chain_seek_reset(struct vf_instance *vf) vf_forget_frames(cur); } -int vf_reconfig_wrapper(struct vf_instance *vf, struct mp_image_params *p, +int vf_reconfig_wrapper(struct vf_instance *vf, const struct mp_image_params *p, int flags) { vf_forget_frames(vf); @@ -446,7 +446,8 @@ int vf_reconfig_wrapper(struct vf_instance *vf, struct mp_image_params *p, int r; if (vf->reconfig) { - r = vf->reconfig(vf, p, flags); + struct mp_image_params params = *p; + r = vf->reconfig(vf, ¶ms, flags); } else { r = vf->config(vf, p->w, p->h, p->d_w, p->d_h, flags, p->imgfmt); r = r ? 0 : -1; diff --git a/video/filter/vf.h b/video/filter/vf.h index 067e857f0d..c792049b3b 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -99,8 +99,6 @@ typedef struct vf_seteq { #define VFCTRL_SET_PP_LEVEL 5 // set postprocessing level #define VFCTRL_SET_EQUALIZER 6 // set color options (brightness,contrast etc) #define VFCTRL_GET_EQUALIZER 8 // get color options (brightness,contrast etc) -#define VFCTRL_HWDEC_DECODER_RENDER 9 // vdpau hw decoding -#define VFCTRL_HWDEC_ALLOC_SURFACE 10 // vdpau hw decoding #define VFCTRL_SCREENSHOT 14 // Take screenshot, arg is voctrl_screenshot_args #define VFCTRL_INIT_OSD 15 // Filter OSD renderer present? #define VFCTRL_SET_DEINTERLACE 18 // Set deinterlacing status @@ -147,8 +145,8 @@ vf_instance_t *vf_find_by_label(vf_instance_t *chain, const char *label); void vf_uninit_filter(vf_instance_t *vf); void vf_uninit_filter_chain(vf_instance_t *vf); -int vf_reconfig_wrapper(struct vf_instance *vf, struct mp_image_params *params, - int flags); +int vf_reconfig_wrapper(struct vf_instance *vf, + const struct mp_image_params *params, int flags); void vf_print_filter_chain(int msglevel, struct vf_instance *vf); void vf_rescale_dsize(int *d_width, int *d_height, int old_w, int old_h, diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index 60113192b7..9edb393e23 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -87,10 +87,6 @@ static int control(struct vf_instance *vf, int request, void *data) }; return vo_control(video_out, VOCTRL_GET_EQUALIZER, ¶m) == VO_TRUE; } - case VFCTRL_HWDEC_DECODER_RENDER: - return vo_control(video_out, VOCTRL_HWDEC_DECODER_RENDER, data); - case VFCTRL_HWDEC_ALLOC_SURFACE: - return vo_control(video_out, VOCTRL_HWDEC_ALLOC_SURFACE, data); } return CONTROL_UNKNOWN; } |