pass moblin compile

diff --git a/va/va.h b/va/va.h
index 394b810..76de2c7 100644 (file)
--- a/va/va.h
+++ b/va/va.h
@@ -67,7 +67,7 @@
 #ifndef _VA_H_
 #define _VA_H_
 
-#include <va/va_version.h.in>
+#include <va/va_version.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/va/va_android.h b/va/va_android.h
index 9858049..176c258 100644 (file)
--- a/va/va_android.h
+++ b/va/va_android.h
@@ -2,6 +2,8 @@
 #define _VA_ANDROID_H_
 
 #include <va/va.h>
+#include <ui/Surface.h>
+class Surface;
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/va/va_backend.h b/va/va_backend.h
index cd6201e..25dfeed 100644 (file)
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -32,9 +32,6 @@
 #include <va/va.h>
 #include <X11/Xlib.h>
 #include <linux/videodev2.h>
-#include <ui/Surface.h>
-
-class Surface;
 
 typedef struct VADriverContext *VADriverContextP;
 typedef struct VADisplayContext *VADisplayContextP;
@@ -182,7 +179,7 @@ struct VADriverVTable
        VAStatus (*vaPutSurface) (
                VADriverContextP ctx,
                VASurfaceID surface,
-               Surface* draw, /* X Drawable */
+               void* draw, /* X Drawable */
                short srcx,
                short srcy,
                unsigned short srcw,

diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index ab6bf68..6cbe6a0 100644 (file)
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -247,7 +247,7 @@ VAStatus vaPutSurface (
   CHECK_DISPLAY(dpy);
   ctx = CTX(dpy);
 
-  return ctx->vtable.vaPutSurface( ctx, surface, draw, srcx, srcy, srcw, srch,
+  return ctx->vtable.vaPutSurface( ctx, surface, &draw, srcx, srcy, srcw, srch,
                                    destx, desty, destw, desth,
                                    cliprects, number_cliprects, flags );
 }