[vlc-devel] [PATCH 1/3] kms: move code before next patch

Steve Lhomme robux4 at ycbcr.xyz
Mon Dec 2 15:30:16 CET 2019


No functional change.
---
 modules/video_output/kms.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/modules/video_output/kms.c b/modules/video_output/kms.c
index 9352dc90f66..81f8a0d01aa 100644
--- a/modules/video_output/kms.c
+++ b/modules/video_output/kms.c
@@ -495,6 +495,21 @@ static bool ChromaNegotiation(vout_display_t *vd)
     return false;
 }
 
+static void CustomDestroyPicture(picture_t *p_picture)
+{
+    picture_sys_t *psys = (picture_sys_t*)p_picture->p_sys;
+    vout_display_sys_t *sys = (vout_display_sys_t *)psys->p_voutsys;
+    int c;
+
+    for (c = 0; c < MAXHWBUF; c++)
+        DestroyFB(sys, c);
+
+    drmSetClientCap(sys->drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 0);
+    drmDropMaster(sys->drm_fd);
+    vlc_close(sys->drm_fd);
+    sys->drm_fd = 0;
+    free(p_picture->p_sys);
+}
 
 static int OpenDisplay(vout_display_t *vd)
 {
@@ -598,23 +613,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
 }
 
 
-static void CustomDestroyPicture(picture_t *p_picture)
-{
-    picture_sys_t *psys = (picture_sys_t*)p_picture->p_sys;
-    vout_display_sys_t *sys = (vout_display_sys_t *)psys->p_voutsys;
-    int c;
-
-    for (c = 0; c < MAXHWBUF; c++)
-        DestroyFB(sys, c);
-
-    drmSetClientCap(sys->drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 0);
-    drmDropMaster(sys->drm_fd);
-    vlc_close(sys->drm_fd);
-    sys->drm_fd = 0;
-    free(p_picture->p_sys);
-}
-
-
 static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 {
     VLC_UNUSED(count);
-- 
2.17.1



More information about the vlc-devel mailing list