[vlc-commits] gl: vaapi: fix double close

Thomas Guillem git at videolan.org
Thu Jul 13 15:53:32 CEST 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jul 13 15:52:47 2017 +0200| [db6f938e7cf877837a27f4633bb72c9289d41990] | committer: Thomas Guillem

gl: vaapi: fix double close

drm_fd is already closed from tc_vaegl_init in case of error.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db6f938e7cf877837a27f4633bb72c9289d41990
---

 modules/video_output/opengl/converter_vaapi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
index e236de7f8b..9044398432 100644
--- a/modules/video_output/opengl/converter_vaapi.c
+++ b/modules/video_output/opengl/converter_vaapi.c
@@ -434,7 +434,8 @@ opengl_tex_converter_vaapi_init(opengl_tex_converter_t *tc)
             if (ret == VLC_SUCCESS)
                 return ret;
         }
-        vlc_close(drm_fd);
+        else
+            vlc_close(drm_fd);
     }
     /* Fallback to X11 or WAYLAND */
 #endif



More information about the vlc-commits mailing list