vainfo: report both VA-API and libva versions.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am
index 8d9d017..190aa8b 100644 (file)
--- a/test/vainfo/Makefile.am
+++ b/test/vainfo/Makefile.am
@@ -23,12 +23,15 @@
 
 bin_PROGRAMS = vainfo
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/test/basic
+INCLUDES = \
+       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/test/basic                      \
+       -DLIBVA_VERSION_S="\"${LIBVA_VERSION}\""        \
+       $(NULL)
 
 vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib) -lX11
 
 vainfo_DEPENDENCIES =  $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
-vainfo_SOURCES = vainfo.c
 
 valgrind:      vainfo
        valgrind --leak-check=full --show-reachable=yes .libs/vainfo; 

diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c
index 4fc0300..b5e6123 100644 (file)
--- a/test/vainfo/vainfo.c
+++ b/test/vainfo/vainfo.c
@@ -116,7 +116,8 @@ int main(int argc, const char* argv[])
   va_status = vaInitialize(va_dpy, &major_version, &minor_version);
   CHECK_VASTATUS(va_status, "vaInitialize", 3);
   
-  printf("%s: VA API version: %d.%d\n", name, major_version, minor_version);
+  printf("%s: VA-API version: %d.%d (libva %s)\n",
+         name, major_version, minor_version, LIBVA_VERSION_S);
 
   driver = vaQueryVendorString(va_dpy);
   printf("%s: Driver version: %s\n", name, driver ? driver : "<unknown>");