diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-04-06 11:29:37 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-04-08 07:14:50 +0200 |
| commit | 5b2028e8a425e1d2410a925e33ee27e0fb6c1327 (patch) | |
| tree | 54325a80faa8b4833107a54fda739a1e98686b55 | |
| parent | 6c2765a53496384cd7f27af3935d7a2fee7e8bba (diff) | |
Revert "declare vaGetDisplay in va.h instead of va_xxx.h"
vaGetDisplay() belongs to winsys headers.
This reverts commit 52c87f898b210cddde70231021097c5a0bb6fdc3.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@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, 23 insertions, 8 deletions
@@ -182,13 +182,6 @@ 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 dbb3c83..7b98949 100644 --- a/va/va_android.h +++ b/va/va_android.h @@ -4,6 +4,21 @@ #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 7ff9fdd..c6f9670 100644 --- a/va/va_x11.h +++ b/va/va_x11.h @@ -9,6 +9,13 @@ 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 08e3086..a593712 100644 --- a/va/x11/va_x11.c +++ b/va/x11/va_x11.c @@ -188,7 +188,7 @@ static VAStatus va_FreeNativePixmap( } VADisplay vaGetDisplay ( - VANativeDisplay native_dpy /* implementation specific */ + Display *native_dpy /* implementation specific */ ) { VADisplay dpy = NULL; |