From b9dddc051d57b313fdc9f14ec388b060fdff3924 Mon Sep 17 00:00:00 2001
From: "tobias.jakobi1@uni-bielefeld.de" <tobias.jakobi1@uni-bielefeld.de>
Date: Tue, 23 Sep 2014 20:13:11 +0200
Subject: [PATCH] uxa/video: only call intel_xvmc_adaptor_init when xvmc is
 enabled

Build regression from

commit 616dea2c67847101fd43b5d89b556b3702c7f0bb
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Jul 24 10:27:55 2014 -0700

    Rename uxa-specific functions and structs

Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
---
 src/uxa/intel_video.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/uxa/intel_video.c b/src/uxa/intel_video.c
index 310b6c9f..33d447cc 100644
--- a/src/uxa/intel_video.c
+++ b/src/uxa/intel_video.c
@@ -239,8 +239,10 @@ void intel_video_init(ScreenPtr screen)
 		intel->XvEnabled = FALSE;
 	}
 
+#ifdef INTEL_XVMC
         if (texturedAdaptor)
                 intel_xvmc_adaptor_init(screen);
+#endif
 
 	free(adaptors);
 }