xf86-video-intel: src/i830_video.c

[Keith Packard]

 src/i830_video.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 18ef4158e5574bfc6621b268821532f13e261d13
Author: Keith Packard <keithp at keithp.com>
Date:   Sun Apr 13 21:37:49 2008 -0700

    Only use FOURCC_XVMC when INTEL_XVMC is defined
    
    The XVMC code uses a magic FOURCC code to signal frame updates, but that
    code is only defined when the XVMC code is used.

diff --git a/src/i830_video.c b/src/i830_video.c
index 7309949..1fa9d75 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2060,7 +2060,9 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
     switch (id) {
     case FOURCC_YV12:
     case FOURCC_I420:
+#ifdef INTEL_XVMC
     case FOURCC_XVMC:
+#endif
 	OVERLAY_DEBUG("YUV420\n");
 #if 0
 	/* set UV vertical phase to -0.25 */
@@ -2315,7 +2317,9 @@ I830PutImage(ScrnInfoPtr pScrn,
     switch (destId) {
     case FOURCC_YV12:
     case FOURCC_I420:
+#ifdef INTEL_XVMC
     case FOURCC_XVMC:
+#endif
 	if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
 	    dstPitch = ((height / 2) + pitchAlignMask) & ~pitchAlignMask;
 	    size = dstPitch * width * 3;
@@ -2422,8 +2426,10 @@ I830PutImage(ScrnInfoPtr pScrn,
 	I830CopyPackedData(pScrn, pPriv, buf, srcPitch, dstPitch, top, left,
 			   nlines, npixels);
 	break;
+#ifdef INTEL_XVMC
     case FOURCC_XVMC:
 	break;
+#endif
     default:
 	break;
     }