diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:53:42 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:53:42 +0100 |
| commit | d2dae84b3d8daf98062680a31663690718d9e867 (patch) | |
| tree | d5ba7a097214845b8e4c82b6c56ed4c854f3a49a /nx-X11/programs/Xserver/Xext/xvdisp.c | |
| parent | fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b (diff) | |
| parent | 49607e93f53c7d15c8d18b36763e855ecb42a496 (diff) | |
| download | nx-libs-d2dae84b3d8daf98062680a31663690718d9e867.tar.gz nx-libs-d2dae84b3d8daf98062680a31663690718d9e867.tar.bz2 nx-libs-d2dae84b3d8daf98062680a31663690718d9e867.zip | |
Merge branch 'uli42-pr/Xext-1.4.2' into 3.6.x
Attributes GH PR #735: https://github.com/ArcticaProject/nx-libs/pull/735
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xvdisp.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index 5f65c3fcd..54ab4ac48 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -381,10 +381,8 @@ ProcXvQueryAdaptors(ClientPtr client) xvFormat format; xvAdaptorInfo ainfo; xvQueryAdaptorsReply rep; - int totalSize; - int na; + int totalSize, na, nf; XvAdaptorPtr pa; - int nf; XvFormatPtr pf; WindowPtr pWin; ScreenPtr pScreen; @@ -539,9 +537,9 @@ ProcXvQueryEncodings(ClientPtr client) static int ProcXvPutVideo(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvPutVideoReq); @@ -585,9 +583,9 @@ ProcXvPutVideo(ClientPtr client) static int ProcXvPutStill(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvPutStillReq); @@ -632,9 +630,9 @@ ProcXvPutStill(ClientPtr client) static int ProcXvGetVideo(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvGetVideoReq); @@ -679,9 +677,9 @@ ProcXvGetVideo(ClientPtr client) static int ProcXvGetStill(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvGetStillReq); @@ -725,7 +723,7 @@ ProcXvGetStill(ClientPtr client) static int ProcXvSelectVideoNotify(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; REQUEST(xvSelectVideoNotifyReq); REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq); @@ -831,7 +829,7 @@ static int ProcXvStopVideo(ClientPtr client) { int status; - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; REQUEST(xvStopVideoReq); REQUEST_SIZE_MATCH(xvStopVideoReq); |