summaryrefslogtreecommitdiff
path: root/src/i830_video.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/i830_video.c')
-rw-r--r--src/i830_video.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/i830_video.c b/src/i830_video.c
index 31be8a64..794aecfc 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1449,9 +1449,12 @@ I830PutImage(ScrnInfoPtr pScrn,
if (pI830->entityPrivate) {
if (pI830->entityPrivate->XvInUse != -1 &&
pI830->entityPrivate->XvInUse != pI830->pipe) {
+#ifdef PANORAMIX
if (!noPanoramiXExtension) {
return Success; /* faked for trying to share it */
- } else {
+ } else
+#endif
+ {
return BadAlloc;
}
}
@@ -1834,9 +1837,12 @@ I830DisplaySurface(XF86SurfacePtr surface,
if (pI830->entityPrivate) {
if (pI830->entityPrivate->XvInUse != -1 &&
pI830->entityPrivate->XvInUse != pI830->pipe) {
+#ifdef PANORAMIX
if (!noPanoramiXExtension) {
return Success; /* faked for trying to share it */
- } else {
+ } else
+#endif
+ {
return BadAlloc;
}
}