diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /video/filter/vf.h | |
parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'video/filter/vf.h')
-rw-r--r-- | video/filter/vf.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index 901ccead95..241af02081 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -90,6 +90,9 @@ typedef struct vf_instance { struct mp_image_params fmt_in, fmt_out; + // This is a dirty hack. + struct AVBufferRef *in_hwframes_ref, *out_hwframes_ref; + struct mp_image_pool *out_pool; struct vf_priv_s *priv; struct mp_log *log; @@ -123,6 +126,9 @@ struct vf_chain { struct mpv_global *global; struct mp_hwdec_devices *hwdec_devs; + // This is a dirty hack. + struct AVBufferRef *in_hwframes_ref; + // Call when the filter chain wants new processing (for filters with // asynchronous behavior) - must be immutable once filters are created, // since they are supposed to call it from foreign threads. @@ -150,6 +156,7 @@ enum vf_ctrl { struct vf_chain *vf_new(struct mpv_global *global); void vf_destroy(struct vf_chain *c); +void vf_set_proto_frame(struct vf_chain *c, struct mp_image *img); int vf_reconfig(struct vf_chain *c, const struct mp_image_params *params); int vf_control_any(struct vf_chain *c, int cmd, void *arg); int vf_control_by_label(struct vf_chain *c, int cmd, void *arg, bstr label); |