diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2011-11-08 10:29:40 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2011-12-14 08:27:03 +0800 |
| commit | 52c87f898b210cddde70231021097c5a0bb6fdc3 (patch) | |
| tree | b41c17e575e7e5e6fde57a0d0be88387c66f29f6 | |
| parent | a65acb298894fa90e3cb7692795027143d6b1dbe (diff) | |
| download | libva-52c87f898b210cddde70231021097c5a0bb6fdc3.tar.gz | |
declare vaGetDisplay in va.h instead of va_xxx.h
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
| -rw-r--r-- | va/va.h | 7 | ||||
| -rw-r--r-- | va/va_android.h | 15 | ||||
| -rw-r--r-- | va/va_x11.h | 7 | ||||
| -rw-r--r-- | va/x11/va_x11.c | 2 |
4 files changed, 8 insertions, 23 deletions
@@ -182,6 +182,13 @@ const char *vaErrorStr(VAStatus error_status); */ typedef void* VANativeDisplay; /* window system dependent */ +/* + * Returns a suitable VADisplay for VA API + */ +VADisplay vaGetDisplay ( + VANativeDisplay dpy +); + int vaDisplayIsValid(VADisplay dpy); /* diff --git a/va/va_android.h b/va/va_android.h index 7b98949..dbb3c83 100644 --- a/va/va_android.h +++ b/va/va_android.h @@ -4,21 +4,6 @@ #include <va/va.h> #ifdef __cplusplus -extern "C" { -#endif - -/* - * Returns a suitable VADisplay for VA API - */ -VADisplay vaGetDisplay ( - void *android_dpy -); - -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus #ifdef ANDROID #include <surfaceflinger/ISurface.h> using namespace android; diff --git a/va/va_x11.h b/va/va_x11.h index c6f9670..7ff9fdd 100644 --- a/va/va_x11.h +++ b/va/va_x11.h @@ -9,13 +9,6 @@ extern "C" { #endif /* - * Returns a suitable VADisplay for VA API - */ -VADisplay vaGetDisplay ( - Display *dpy -); - -/* * Output rendering * Following is the rendering interface for X windows, * to get the decode output surface to a X drawable diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c index 86b040a..b51f5f0 100644 --- a/va/x11/va_x11.c +++ b/va/x11/va_x11.c @@ -163,7 +163,7 @@ static VAStatus va_DisplayContextGetDriverName ( VADisplay vaGetDisplay ( - Display *native_dpy /* implementation specific */ + VANativeDisplay native_dpy /* implementation specific */ ) { VADisplay dpy = NULL; |