From 90cd5aa8c8950406b335dfb34c01b0fdae833da9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Jun 2014 23:05:50 +0200 Subject: vo: make draw_image and vo_queue_image transfer image ownership Basically a cosmetic change. This is probably more intuitive. --- video/out/vo_vaapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'video/out/vo_vaapi.c') diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index c1c34370fd..caf383c3f4 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -280,13 +280,15 @@ static void draw_image(struct vo *vo, struct mp_image *mpi) struct mp_image *dst = p->swdec_surfaces[p->output_surface]; if (!dst || va_surface_upload(dst, mpi) < 0) { MP_WARN(vo, "Could not upload surface.\n"); + talloc_free(mpi); return; } mp_image_copy_attributes(dst, mpi); mpi = dst; } - mp_image_setrefp(&p->output_surfaces[p->output_surface], mpi); + talloc_free(p->output_surfaces[p->output_surface]); + p->output_surfaces[p->output_surface] = mpi; draw_osd(vo); } -- cgit v1.2.3