summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Zhang <carl.zhang@intel.com>2019-07-05 12:21:39 -0400
committerCarl Zhang <carl.zhang@intel.com>2019-07-05 12:21:39 -0400
commitd9d7d198192ec29548d64dde748cbf75f3908e1b (patch)
tree05347ff0dd84f10ea0b557d94eaf872fcf73e26d
parentf8c3f50dff78babe01c77f146d20c72b25ef655b (diff)
downloadlibva-d9d7d198192ec29548d64dde748cbf75f3908e1b.tar.gz
libva 2.6.0 pre1
Bump VA-API version to 1.6.0 pre1 and libva to 2.6.0 pre1 Signed-off-by: Carl Zhang <carl.zhang@intel.com>
-rw-r--r--configure.ac2
-rw-r--r--meson.build4
-rw-r--r--va/va.c1
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 7942f57..d109aee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
# - reset micro version to zero when minor version is incremented
# - reset minor version to zero when major version is incremented
m4_define([va_api_major_version], [1])
-m4_define([va_api_minor_version], [5])
+m4_define([va_api_minor_version], [6])
m4_define([va_api_micro_version], [0])
m4_define([va_api_version],
diff --git a/meson.build b/meson.build
index b3270dd..aabae7b 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@
# - reset micro version to zero when VA-API major or minor version is changed
project(
'libva', 'c',
- version : '2.5.0.1',
+ version : '2.6.0.1',
meson_version : '>= 0.37.0',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@ -19,7 +19,7 @@ project(
# - reset micro version to zero when minor version is incremented
# - reset minor version to zero when major version is incremented
va_api_major_version = 1
-va_api_minor_version = 5
+va_api_minor_version = 6
va_api_micro_version = 0
va_api_version = '@0@.@1@.@2@'.format(va_api_major_version,
diff --git a/va/va.c b/va/va.c
index 44ee634..633377b 100644
--- a/va/va.c
+++ b/va/va.c
@@ -417,6 +417,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
int minor;
} compatible_versions[] = {
{ VA_MAJOR_VERSION, VA_MINOR_VERSION },
+ { VA_MAJOR_VERSION, 5 },
{ VA_MAJOR_VERSION, 4 },
{ VA_MAJOR_VERSION, 3 },
{ VA_MAJOR_VERSION, 2 },