commit 59575183a502c3f872f48c9099f1a0c6eb670193
author Austin Yuan <shengquan.yuan@intel.com> Mon Nov 23 16:21:41 2009 +0800
committer Austin Yuan <shengquan.yuan@intel.com> Mon Nov 23 16:21:41 2009 +0800
tree 63f60a7b7d4409df98eb9f09627b6274eea693bc
parent 1ead54598b3562dec0bb17e9a35284a274c47056
parent ec0e66e57c4ee66b89a9a886f9d464da5893aac8

Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva

src/va.c

diff --git a/src/va.c b/src/va.c
index 6bc9c06..2cdbe02 100644
--- a/src/va.c
+++ b/src/va.c
@@ -58,7 +58,7 @@
 static int vaDisplayIsValid(VADisplay dpy)
 {
   VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
-  return pDisplayContext && pDisplayContext->vaIsValid(pDisplayContext);
+  return pDisplayContext && (pDisplayContext->vadpy_magic == 0x789abcde) && pDisplayContext->vaIsValid(pDisplayContext);
 }
 
 static void va_errorMessage(const char *msg, ...)

src/va_backend.h

diff --git a/src/va_backend.h b/src/va_backend.h
index 6f858f5..e4faa79 100644
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -398,6 +398,8 @@
 
 struct VADisplayContext
 {
+    int vadpy_magic;
+    
     VADisplayContextP pNext;
     VADriverContextP pDriverContext;
 

src/x11/va_x11.c

diff --git a/src/x11/va_x11.c b/src/x11/va_x11.c
index 5908fbe..42adb9e 100644
--- a/src/x11/va_x11.c
+++ b/src/x11/va_x11.c
@@ -189,6 +189,8 @@
       dri_state       = calloc(1, sizeof(*dri_state));
       if (pDisplayContext && pDriverContext && dri_state)
       {
+	  pDisplayContext->vadpy_magic = 0x789abcde;          
+
 	  pDriverContext->x11_dpy          = native_dpy;
 	  pDisplayContext->pNext           = pDisplayContexts;
 	  pDisplayContext->pDriverContext  = pDriverContext;