diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2007-07-20 17:10:27 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2007-07-20 17:10:27 +0800 |
| commit | a52c53b8603495ab05e07e3da5092fe122fcb6f2 (patch) | |
| tree | 5ab05fce72d270ffe6cd3a6203562aac5162bda5 /src/i830_video.c | |
| parent | 6b4d43dbf4bbb86d479d8fca480c8bec39e2714b (diff) | |
don't initialize XvMC if xv is disabled.
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 4 |
1 files changed, 3 insertions, 1 deletions
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,9 +604,11 @@ 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, "Failed to set up textured video\n"); |