diff options
| author | Ren Zhaohan <zhaohan.ren@intel.com> | 2010-04-01 22:04:18 +0800 |
|---|---|---|
| committer | Ren Zhaohan <zhaohan.ren@intel.com> | 2010-04-01 22:04:18 +0800 |
| commit | 680ebba266f351d944a4cd0ba6c73a7a8f0d8870 (patch) | |
| tree | c7f2bc09240924a70cf6b69af9fc0ec3ed4a37ce | |
| parent | 24914b55e70e2012682eecd8e81bb3bd5fada310 (diff) | |
| download | libva-680ebba266f351d944a4cd0ba6c73a7a8f0d8870.tar.gz | |
pass moblin compile
| -rw-r--r-- | va/va.h | 2 | ||||
| -rw-r--r-- | va/va_android.h | 2 | ||||
| -rw-r--r-- | va/va_backend.h | 5 | ||||
| -rw-r--r-- | va/x11/va_x11.c | 2 |
4 files changed, 5 insertions, 6 deletions
@@ -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 --- 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 --- 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 --- 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 ); } |