diff --git a/configure.ac b/configure.ac index 4eb7fae..45d61d0 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,6 @@ AC_SUBST(moduledir) # Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) -XORG_DRIVER_CHECK_EXT(XV, videoproto) if test "x$DGA" = xyes; then XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) diff --git a/src/dummy.h b/src/dummy.h index c3fdd6e..c231be4 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -31,9 +31,6 @@ extern void DUMMYHideCursor(ScrnInfoPtr pScrn); /* in dummy_dga.c */ Bool DUMMYDGAInit(ScreenPtr pScreen); -/* in dummy_video.c */ -extern void DUMMYInitVideo(ScreenPtr pScreen); - /* globals */ typedef struct _color { @@ -60,14 +57,6 @@ typedef struct dummyRec int cursorFG, cursorBG; Bool screenSaver; - Bool video; -#ifdef XvExtension - XF86VideoAdaptorPtr overlayAdaptor; -#endif - int overlay; - int overlay_offset; - int videoKey; - int interlace; dummy_colors colors[256]; pointer* FBBase; Bool (*CreateWindow)() ; /* wrapped CreateWindow */ diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 2656602..c9ff925 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -29,11 +29,6 @@ #include "picturestr.h" -#ifdef XvExtension -#include "xf86xv.h" -#include -#endif - /* * Driver data structures. */ @@ -618,8 +613,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) | CMAP_RELOAD_ON_MODE_SWITCH)) return FALSE; -/* DUMMYInitVideo(pScreen); */ - pScreen->SaveScreen = DUMMYSaveScreen;