From a52c53b8603495ab05e07e3da5092fe122fcb6f2 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Fri, 20 Jul 2007 17:10:27 +0800
Subject: don't initialize XvMC if xv is disabled.

---
 src/i830_video.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/i830_video.c')

diff --git a/src/i830_video.c b/src/i830_video.c
index 1c1fbabd..a74634fa 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -604,8 +604,10 @@ I830InitVideo(ScreenPtr pScreen)
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
 
 #ifdef XF86DRI
-            if (/* pI830->XvMCEnabled && */IS_I9XX(pI830))
+#ifdef XvMCExtension
+            if (IS_I9XX(pI830))
                I915XvMCInitXv(pScrn, texturedAdaptor);
+#endif
 #endif
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-- 
cgit v1.2.3