xserver: Branch 'master'

[GitLab Mirror]

 Xext/xvdix_priv.h |    2 ++
 Xext/xvmcext.h    |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 33a42501574deaf220e14bf8cff82fa001e5161f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Sep 13 13:54:17 2024 +0200

    xvmc: unexport XvMCFindXvImage()
    
    It's not needed by any driver, so no need to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1694>

diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index f304dbc73..5bd08e334 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -88,4 +88,6 @@ int XvdiMatchPort(XvPortPtr pPort, DrawablePtr pDraw);
 int XvdiGrabPort(ClientPtr client, XvPortPtr pPort, Time ctime, int *p_result);
 int XvdiUngrabPort(ClientPtr client, XvPortPtr pPort, Time ctime);
 
+XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
+
 #endif /* _XORG_XVDIX_PRIV_H */
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index 4a0b5bdee..acfbee7d6 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -87,8 +87,6 @@ typedef struct {
 extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
                                     int num, XvMCAdaptorPtr adapt);
 
-extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
-
 extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name,
                                             const char *busID, int major, int minor,
                                             int patchLevel);