summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRen Zhaohan <zhaohan.ren@intel.com>2010-05-26 13:17:51 +0800
committerRen Zhaohan <zhaohan.ren@intel.com>2010-05-26 13:17:51 +0800
commit795896536af5abcd85f36870a5dbc41b1f6fe59e (patch)
tree2bf3349bc41a5e5bd13d5bddb4f2794819876646
parent20f8144251966cabe16e353f6f354946f4cb605d (diff)
update va_android.h to make sure it could be safely include in a C or C++ file20100526_5.3.0.0009
-rw-r--r--va/va_android.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/va/va_android.h b/va/va_android.h
index 062c90b..2ca6852 100644
--- a/va/va_android.h
+++ b/va/va_android.h
@@ -3,26 +3,23 @@
#include <va/va.h>
-#ifdef ANDROID
-#include <ui/ISurface.h>
-using namespace android;
-#endif
-
#ifdef __cplusplus
extern "C" {
-#endif
/*
* Returns a suitable VADisplay for VA API
*/
VADisplay vaGetDisplay (
void *android_dpy
);
+}
#ifdef ANDROID
+#include <ui/ISurface.h>
+using namespace android;
/*
* Output rendering
- * Following is the rendering interface for X windows,
- * to get the decode output surface to a X drawable
+ * Following is the rendering interface for Android system,
+ * to get the decode output surface to an ISurface object.
* It basically performs a de-interlacing (if needed),
* color space conversion and scaling to the destination
* rectangle
@@ -44,8 +41,5 @@ VAStatus vaPutSurface (
unsigned int flags /* PutSurface flags */
);
#endif
-
-#ifdef __cplusplus
-}
#endif
#endif /* _VA_ANDROID_H_ */