summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-11-24 17:35:36 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-11-24 22:04:50 +0000
commit394ad51c421f41e4bc6545fcee10b1757cb5f518 (patch)
treed9aab272f287cf6934068f12c1121a4a9db8fbf9
parenta2fab9560ec5dd6efc352917fe7626e59bed69e3 (diff)
sna/video: Check for Xv presence in the server before initialising
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_video.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
index 068b8039..bd5ff14a 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -493,6 +493,9 @@ void sna_video_init(struct sna *sna, ScreenPtr screen)
int prefer_overlay =
xf86ReturnOptValBool(sna->Options, OPTION_PREFER_OVERLAY, FALSE);
+ if (!xf86LoaderCheckSymbol("xf86XVListGenericAdaptors"))
+ return;
+
num_adaptors = xf86XVListGenericAdaptors(sna->scrn, &adaptors);
newAdaptors =
malloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *));