[vlc-devel] [PATCH] Fix DRM DR VAAPI use case

Mathieu Velten matmaul at gmail.com
Mon Sep 4 19:05:40 CEST 2017


- missing break
- close is already handled in the error case of fct tc_vaegl_init
---
 modules/video_output/opengl/converter_vaapi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
index 6ffee98fb5..bcfb23d159 100644
--- a/modules/video_output/opengl/converter_vaapi.c
+++ b/modules/video_output/opengl/converter_vaapi.c
@@ -389,6 +389,7 @@ Open(vlc_object_t *obj)
         return VLC_EGENERIC;
 
     int ret = VLC_EGENERIC;
+
 #if defined (HAVE_VA_X11)
     if (tc->gl->surface->type == VOUT_WINDOW_TYPE_XID)
     {
@@ -422,9 +423,9 @@ Open(vlc_object_t *obj)
         {
             ret = tc_vaegl_init(tc, dpy, (VANativeDisplay) (intptr_t) drm_fd,
                                 drm_native_destroy_cb);
+            if (ret == VLC_SUCCESS)
+                break;
         }
-        else
-            vlc_close(drm_fd);
     }
 #endif
 
-- 
2.13.5



More information about the vlc-devel mailing list