diff options
| author | Keith Packard <keithp@keithp.com> | 2008-04-13 21:37:49 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-04-13 21:37:49 -0700 |
| commit | 18ef4158e5574bfc6621b268821532f13e261d13 (patch) | |
| tree | 0a49e336c765b308c560b1910972aa6c09c764d6 /src | |
| parent | 269809030ee9d08b56ad0178a7a9c0194e25785e (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_video.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 73099497..1fa9d75f 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; } |