diff options
| author | wm4 <wm4@nowhere> | 2013-09-27 17:44:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-27 18:00:03 +0200 |
| commit | 0901fc8e0ea4b6c0337add563d1763f0db238023 (patch) | |
| tree | 3e4e4b8f172081902afcf72d87ae444e8d17057b /video/out/vo_vaapi.c | |
| parent | 4d2f354da651a3c1fd9776ed5829f57961a46c10 (diff) | |
| download | mpv-0901fc8e0ea4b6c0337add563d1763f0db238023.tar.bz2 mpv-0901fc8e0ea4b6c0337add563d1763f0db238023.tar.xz | |
vaapi: check image format in va_surface_upload()
Just for robustness. Also print a warning in vo_vaapi if this happens.
Diffstat (limited to 'video/out/vo_vaapi.c')
| -rw-r--r-- | video/out/vo_vaapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |