From 0901fc8e0ea4b6c0337add563d1763f0db238023 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 27 Sep 2013 17:44:21 +0200 Subject: vaapi: check image format in va_surface_upload() Just for robustness. Also print a warning in vo_vaapi if this happens. --- video/out/vo_vaapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/out/vo_vaapi.c') diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index 4f79bbbd1f..6973882176 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -249,10 +249,10 @@ static void draw_image(struct vo *vo, struct mp_image *mpi) if (!IMGFMT_IS_VAAPI(mpi->imgfmt)) { struct mp_image *wrapper = p->swdec_surfaces[p->output_surface]; struct va_surface *surface = va_surface_in_mp_image(wrapper); - if (!surface) - return; - if (!va_surface_upload(surface, mpi)) + if (!surface || !va_surface_upload(surface, mpi)) { + MP_WARN(vo, "Could not upload surface.\n"); return; + } mp_image_copy_attributes(wrapper, mpi); mpi = wrapper; } -- cgit v1.2.3