diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-04 22:58:37 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-08-06 20:12:20 -0700 |
| commit | b01cfe5f23766b9c13ed6bd889263d5d7a8a351d (patch) | |
| tree | 9a26ffff586986c59a9ae460d40471cd83127154 /Xext | |
| parent | 6a71ee79aabe6b611cae443a49786824a0322313 (diff) | |
xv: Move CloseScreen setup from a DIX hook to normal wrapping.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/xvdix.h | 1 | ||||
| -rw-r--r-- | Xext/xvmain.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/Xext/xvdix.h b/Xext/xvdix.h index b61659ce4..534e7d3f8 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -213,7 +213,6 @@ typedef struct { DestroyWindowProcPtr DestroyWindow; DestroyPixmapProcPtr DestroyPixmap; CloseScreenProcPtr CloseScreen; - Bool (*ddCloseScreen) (ScreenPtr); } XvScreenRec, *XvScreenPtr; #define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \ diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 2046b9dfa..4a439e32c 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -302,8 +302,6 @@ XvCloseScreen(ScreenPtr pScreen) pScreen->DestroyWindow = pxvs->DestroyWindow; pScreen->CloseScreen = pxvs->CloseScreen; - (*pxvs->ddCloseScreen) (pScreen); - free(pxvs); dixSetPrivate(&pScreen->devPrivates, XvScreenKey, NULL); |