summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2017-09-29 10:58:30 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2017-09-29 14:51:19 +0800
commit1c48cd308fca0cf8df7948144c88eeb1725551e0 (patch)
treef843739bc97571227dd5347527cabb0a25849deb
parentad3ec68b2b5d0135ed4165545833bd07ead29a37 (diff)
downloadlibva-1c48cd308fca0cf8df7948144c88eeb1725551e0.tar.gz
Fix build issue on Android
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
-rw-r--r--va/Android.mk3
-rw-r--r--va/android/va_android.cpp2
-rw-r--r--va/va_internal.h8
3 files changed, 11 insertions, 2 deletions
diff --git a/va/Android.mk b/va/Android.mk
index 0f872c3..22f80c8 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -36,7 +36,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
va.c \
va_trace.c \
- va_fool.c
+ va_fool.c \
+ va_str.c
LOCAL_CFLAGS_32 += \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \
diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
index ab54684..ae96236 100644
--- a/va/android/va_android.cpp
+++ b/va/android/va_android.cpp
@@ -206,7 +206,7 @@ VAStatus vaPutSurface (
{
VADriverContextP ctx;
- if (fool_postp)
+ if (va_fool_postp)
return VA_STATUS_SUCCESS;
if (draw == NULL)
diff --git a/va/va_internal.h b/va/va_internal.h
index c666159..7b8da55 100644
--- a/va/va_internal.h
+++ b/va/va_internal.h
@@ -25,6 +25,10 @@
#ifndef VA_INTERNAL_H
#define VA_INTERNAL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
@@ -35,4 +39,8 @@ int va_parseConfig(char *env, char *env_value);
VADisplayContextP va_newDisplayContext(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* VA_INTERNAL_H */