diff options
| author | Tomas Carnecky <tom@dbservice.com> | 2012-07-10 02:03:06 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:28:37 -0700 |
| commit | 7a11b817e770cd2196814f1ac6264c6d87b76c6a (patch) | |
| tree | 0bb1790955241d88029503cc6ea920e6323b51c9 /Xext/xvmcext.h | |
| parent | 7d859bd87834dd79c7fa3792075496ece698c082 (diff) | |
Move Xv and XvMC from extmod to built-in
Always build these extensions into the core server, rather than letting
them languish in extmod.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext/xvmcext.h')
| -rw-r--r-- | Xext/xvmcext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index d78171d24..2201d7b5b 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -84,7 +84,8 @@ typedef struct { XvMCDestroySubpictureProcPtr DestroySubpicture; } XvMCAdaptorRec, *XvMCAdaptorPtr; -#ifndef XorgLoader +extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr); + extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr adapt); @@ -93,6 +94,5 @@ extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id); extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, char *busID, int major, int minor, int patchLevel); -#endif #endif /* _XVMC_H */ |