summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-04 17:27:13 +0200
committerwm4 <wm4@nowhere>2015-07-04 17:27:13 +0200
commit95424517a2c9cf0873f3216865638a4ee7d5739a (patch)
tree5ebb354a65c1a7bd36ba1941cce2085adc99f0cb
parenta4d5c193555e43061f78e49b8a6c86d317d3615c (diff)
downloadmpv-95424517a2c9cf0873f3216865638a4ee7d5739a.tar.bz2
mpv-95424517a2c9cf0873f3216865638a4ee7d5739a.tar.xz
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.
-rw-r--r--video/out/vo.c2
1 files changed, 1 insertions, 1 deletions
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;
}