[vlc-commits] kms: move code before next patch
Steve Lhomme
git at videolan.org
Mon Dec 9 09:01:32 CET 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Aug 8 09:23:47 2019 +0200| [4184427524c2ba5ea6a9037ec75f9d66b37d7192] | committer: Steve Lhomme
kms: move code before next patch
No functional change.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4184427524c2ba5ea6a9037ec75f9d66b37d7192
---
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 9352dc90f6..81f8a0d01a 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);
More information about the vlc-commits
mailing list