diff options
| author | Fei Jiang <fei.jiang@intel.com> | 2010-06-11 10:38:21 +0800 |
|---|---|---|
| committer | Francis Tharappel <francis.m.tharappel@intel.com> | 2010-06-15 15:23:52 -0700 |
| commit | b0fac498ca4863166252f1268fda83394db54153 (patch) | |
| tree | 5a16620c688cf15eb5499f615b517ca166be17c2 /test/vainfo.c | |
| parent | b24acf60aa8e6652897501d47ccbd34f2699ade2 (diff) | |
| download | libva-b0fac498ca4863166252f1268fda83394db54153.tar.gz | |
Replace wind river libva with intel UMG libva.
OpencoreHw will call the same vaPutSurface for texture streaming and overlay display.
Divide libva into three libraries: libva, libva-android, libva-tpi
libva: general va API
libva-android: va API used for android platform
libva-tpi: third party interface
Reviewed-by:Francis Tharappel
Change-Id: Ib8fb9da3b6a463af9b91241392a07fdbd9e1beb9
Diffstat (limited to 'test/vainfo.c')
| -rw-r--r-- | test/vainfo.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/test/vainfo.c b/test/vainfo.c index 388249e..33d6ea4 100644 --- a/test/vainfo.c +++ b/test/vainfo.c @@ -22,11 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef IN_LIBVA -#include <va_x11.h> -#else #include <va/va_x11.h> -#endif #include <stdarg.h> #include <stdio.h> @@ -91,17 +87,12 @@ int main(int argc, const char* argv[]) else name = argv[0]; -#ifndef ANDROID dpy = XOpenDisplay(":0.0"); if (NULL == dpy) { fprintf(stderr, "%s: Error, can't open display: '%s'\n", name, display ? display : ""); return 1; } -#else - dpy = malloc(sizeof(Display)); - *dpy = 0; -#endif va_dpy = vaGetDisplay(dpy); if (NULL == va_dpy) @@ -135,11 +126,6 @@ int main(int argc, const char* argv[]) } vaTerminate(va_dpy); - -#ifdef ANDROID - free(dpy); - dpy = NULL; -#endif return 0; } |