libva 1.5.0.pre1 for development

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit 2fb37255e7c9ccb76e65ea74466f5ffafe9c68c0)

Conflicts:
	configure.ac

diff --git a/configure.ac b/configure.ac
index 0287023..0efa515 100644 (file)
--- 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], [0])
-m4_define([va_api_minor_version], [36])
+m4_define([va_api_minor_version], [37])
 m4_define([va_api_micro_version], [0])
 
 m4_define([va_api_version],
@@ -42,7 +42,7 @@ m4_define([va_api_version],
 # - reset micro version to zero when VA-API major or minor version is changed
 m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
 m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
-m4_define([libva_micro_version], [2])
+m4_define([libva_micro_version], [0])
 m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],

diff --git a/va/va.c b/va/va.c
index b508ffb..0298068 100644 (file)
--- a/va/va.c
+++ b/va/va.c
@@ -246,6 +246,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
                 int minor;
             } compatible_versions[] = {
                 { VA_MAJOR_VERSION, VA_MINOR_VERSION },
+                { 0, 36 },
                 { 0, 35 },
                 { 0, 34 },
                 { 0, 33 },