Merge branch 'va_backend' into PO

[android-x86/hardware-intel-common-libva.git] / va / va_backend.h

diff --git a/va/va_backend.h b/va/va_backend.h
index a857857..54db430 100644 (file)
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -30,12 +30,18 @@
 #define _VA_BACKEND_H_
 
 #include <va/va.h>
+#ifndef ANDROID
 #include <X11/Xlib.h>
+#endif
 #include <linux/videodev2.h>
 
 typedef struct VADriverContext *VADriverContextP;
 typedef struct VADisplayContext *VADisplayContextP;
 
+#ifdef ANDROID
+#define Surface void
+#endif
+
 struct VADriverVTable
 {
        VAStatus (*vaTerminate) ( VADriverContextP ctx );
@@ -179,7 +185,7 @@ struct VADriverVTable
        VAStatus (*vaPutSurface) (
                VADriverContextP ctx,
                VASurfaceID surface,
-               void* draw, /* X Drawable */
+               void * draw, /* Drawable of window system */
                short srcx,
                short srcy,
                unsigned short srcw,