diff options
author | Austin Yuan <shengquan.yuan@gmail.com> | 2010-07-09 17:15:54 +0800 |
---|---|---|
committer | Austin Yuan <shengquan.yuan@gmail.com> | 2010-07-09 17:15:54 +0800 |
commit | 016c719c13f19a310e1a9114d602b6cd0f3db5ab (patch) | |
tree | 27ff7c4b9779bd978bcb0d9cf8575de4827e11ee /test/vainfo.c | |
parent | 3c3088a5d713e7a92bc7cf2a0635f4fcda0e52c3 (diff) | |
parent | a1ff5fe5dbf5736fa13ab64ac6ee784f993210f3 (diff) | |
download | libva-016c719c13f19a310e1a9114d602b6cd0f3db5ab.tar.gz |
Merge branch 'master' of ssh://git@moblin.intel.com/umg-moorestown-libva20100721_5.3.0.001520100713_5.3.0.0014
Diffstat (limited to 'test/vainfo.c')
-rw-r--r-- | test/vainfo.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/vainfo.c b/test/vainfo.c index 33d6ea4..bf8dbb9 100644 --- a/test/vainfo.c +++ b/test/vainfo.c @@ -22,7 +22,12 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef ANDROID #include <va/va_x11.h> +#else +#include "va/va_android.h" +#define Display unsigned int +#endif #include <stdarg.h> #include <stdio.h> @@ -87,7 +92,12 @@ int main(int argc, const char* argv[]) else name = argv[0]; +#ifndef ANDROID dpy = XOpenDisplay(":0.0"); +#else + dpy = (Display*)malloc(sizeof(Display)); + *(dpy) = 0x18c34078; +#endif if (NULL == dpy) { fprintf(stderr, "%s: Error, can't open display: '%s'\n", name, display ? display : ""); |