summaryrefslogtreecommitdiffstats
path: root/video/filter/vf.c
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2016-08-26 19:15:57 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2016-08-26 19:15:57 +0200
commite60a36bd4e27162ddc26212ab67afdd69b4164ed (patch)
tree08e9ca345558bc57500a0a1cdf018a9bf837d972 /video/filter/vf.c
parentef2d6ed12537fbd6d5cd98f8759a5d00fe3e8610 (diff)
parentbc97d60542b353141bedeee985f9e5bd68b9f076 (diff)
downloadmpv-e60a36bd4e27162ddc26212ab67afdd69b4164ed.tar.bz2
mpv-e60a36bd4e27162ddc26212ab67afdd69b4164ed.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'video/filter/vf.c')
-rw-r--r--video/filter/vf.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 274ca945a2..b632314426 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -458,6 +458,13 @@ struct mp_image *vf_read_output_frame(struct vf_chain *c)
return vf_dequeue_output_frame(c->last);
}
+// Undo the previous vf_read_output_frame().
+void vf_unread_output_frame(struct vf_chain *c, struct mp_image *img)
+{
+ struct vf_instance *vf = c->last;
+ MP_TARRAY_INSERT_AT(vf, vf->out_queued, vf->num_out_queued, 0, img);
+}
+
// Some filters (vf_vapoursynth) filter on separate threads, and may need new
// input from the decoder, even though the core does not need a new output image
// yet (this is required to get proper pipelining in the filter). If the filter