From 95424517a2c9cf0873f3216865638a4ee7d5739a Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 4 Jul 2015 17:27:13 +0200 Subject: vo: free frames before killing VO This caused issues with hardware decoding. The VOs by definition dictate the lifetime of the hardware context, so no surface allocations must survive the VO. Fixes assertions on exit with vdpau. --- video/out/vo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/video/out/vo.c b/video/out/vo.c index 38bb739046..94dcabf00e 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -822,10 +822,10 @@ static void *vo_thread(void *ptr) } wait_vo(vo, wait_until); } - vo->driver->uninit(vo); forget_frames(vo); // implicitly synchronized talloc_free(in->current_frame); in->current_frame = NULL; + vo->driver->uninit(vo); return NULL; } -- cgit v1.2.3