xserver: Branch 'master'

[GitLab Mirror]

 Xext/xvmc.c    |    2 --
 Xext/xvmcext.h |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit f65520c4a7a34853864c8e67794d9088cbd0144d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Sep 13 14:38:41 2024 +0200

    Xext: xvmc: drop unused XvMCScreenInitProc
    
    This pointer field isn't used anywhere, neither in Xorg nor in drivers.
    No need to keep it around any longer.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1692>

diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 435a1be12..277da1d0e 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -43,8 +43,6 @@ static RESTYPE XvMCRTContext;
 static RESTYPE XvMCRTSurface;
 static RESTYPE XvMCRTSubpicture;
 
-int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = NULL;
-
 typedef struct {
     int num_adaptors;
     XvMCAdaptorPtr adaptors;
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index e8a6dae47..4a0b5bdee 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -84,8 +84,6 @@ typedef struct {
     XvMCDestroySubpictureProcPtr DestroySubpicture;
 } XvMCAdaptorRec, *XvMCAdaptorPtr;
 
-extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr);
-
 extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
                                     int num, XvMCAdaptorPtr adapt);