diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-10-16 12:09:10 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-10-20 13:53:09 +0200 |
| commit | 1953fd484f492329849dbe6818ad0af4907047a1 (patch) | |
| tree | 30706aaaf5279b04c60310e2b8bb0f85a9995f6f | |
| parent | 5b82650dcc150c71ff70d144d1f0fe95afeb291f (diff) | |
| download | libva-1953fd484f492329849dbe6818ad0af4907047a1.tar.gz | |
vainfo: report both VA-API and libva versions.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
| -rw-r--r-- | test/vainfo/Makefile.am | 7 | ||||
| -rw-r--r-- | test/vainfo/vainfo.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am index 8d9d017..190aa8b 100644 --- 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 --- 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>"); |