[PATCH] uxa/video: only call intel_xvmc_adaptor_init when xvmc is enabled

tobias.jakobi1 at uni-bielefeld.de tobias.jakobi1 at uni-bielefeld.de
Tue Sep 23 11:13:11 PDT 2014


Signed-off-by: Tobias Jakobi <tjakobi at 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 310b6c9..33d447c 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);
 }
-- 
1.8.5.5



More information about the xorg-devel mailing list