summaryrefslogtreecommitdiff
path: root/src/nv_video.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-07-16 18:48:32 +1000
committerDave Airlie <airlied@gmail.com>2012-07-16 18:48:32 +1000
commite5e3e733d933fc3accdd6c3c7a02df5950530cae (patch)
treeb681c75b4536050a4165ed4f129db8ec8d21f14e /src/nv_video.c
parent713e9501b87465cf2a62c27605b6fc4a454dad95 (diff)
nv: make XAA optional.
This allows nv to build without XAA. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/nv_video.c')
-rw-r--r--src/nv_video.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nv_video.c b/src/nv_video.c
index 52d651b..0988b0e 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -12,8 +12,6 @@
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
-#include "xaa.h"
-#include "xaalocal.h"
#include "dixstruct.h"
#include "fourcc.h"
@@ -631,8 +629,9 @@ NVPutBlitImage (
}
NVDmaKickoff(pNv);
+#ifdef HAVE_XAA_H
SET_SYNC_FLAG(pNv->AccelInfoRec);
-
+#endif
pPriv->videoStatus = FREE_TIMER;
pPriv->videoTime = currentTime.milliseconds + FREE_DELAY;
pNv->VideoTimerCallback = NVVideoTimerCallback;