Merge branch 'sync-fdo-master'

3 files changed, 3 insertions, 2 deletions

diff --git a/src/va.c b/src/va.c
index 2cdbe02..bc469a0 100644
--- a/src/va.c
+++ b/src/va.c
@@ -58,7 +58,7 @@ static int va_debug_trace = 0;
 static int vaDisplayIsValid(VADisplay dpy)
 {
   VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
-  return pDisplayContext && (pDisplayContext->vadpy_magic == 0x789abcde) && pDisplayContext->vaIsValid(pDisplayContext);
+  return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext);
 }
 
 static void va_errorMessage(const char *msg, ...)
diff --git a/src/va_backend.h b/src/va_backend.h
index e4faa79..d514ba0 100644
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -396,6 +396,7 @@ struct VADriverContext
     void *dri_state;
 };
 
+#define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */
 struct VADisplayContext
 {
     int vadpy_magic;
diff --git a/src/x11/va_x11.c b/src/x11/va_x11.c
index 42adb9e..3e85ba3 100644
--- a/src/x11/va_x11.c
+++ b/src/x11/va_x11.c
@@ -189,7 +189,7 @@ VADisplay vaGetDisplay (
       dri_state       = calloc(1, sizeof(*dri_state));
       if (pDisplayContext && pDriverContext && dri_state)
       {
-	  pDisplayContext->vadpy_magic = 0x789abcde;          
+	  pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
 
 	  pDriverContext->x11_dpy          = native_dpy;
 	  pDisplayContext->pNext           = pDisplayContexts;