libva 2.2.0 pre1

Update NEWS and Bump VA API version to 1.2.0

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
diff --git a/NEWS b/NEWS
index ae7962c..411e353 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
-libva NEWS -- summary of user visible changes.  2018-02-12
+libva NEWS -- summary of user visible changes.  2018-07-xx
 Copyright (C) 2009-2018 Intel Corporation
 
+Version 2.2.0 - DD.July.2018
+* Bump VA-API version to 1.2.0 and libva to 2.2.0
+* Add support for hevc range extension decoding
+* Add support for fast intra prediction in HEVC FEI
+* Add 10/12-bit YUV render target formats
+* Add fourcc code for Y210/Y216/Y410/Y416/RGB565/BGR565
+* Add VA_STATUS_ERROR_NOT_ENOUGH_BUFFER
+* Add VA_SURFACE_ATTRIB_USAGE_HINT_EXPORT
+* Improve documentation
+
 Version 2.1.0 - 12.Feb.2018
 * Bump VA-API version to 1.1.0 and libva to 2.1.0
 * Add API for multi-frame processing
diff --git a/configure.ac b/configure.ac
index 58db510..6fdadaa 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], [1])
+m4_define([va_api_minor_version], [2])
 m4_define([va_api_micro_version], [0])
 
 m4_define([va_api_version],
@@ -42,7 +42,7 @@
 # - 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)])
-m4_define([libva_micro_version], [1])
+m4_define([libva_micro_version], [0])
 m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
diff --git a/meson.build b/meson.build
index 41d2ea3..1f60d39 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.1.1.1',
+  version : '2.2.0.1',
   meson_version : '>= 0.37.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
@@ -19,7 +19,7 @@
 # - 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 = 1
+va_api_minor_version = 2
 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 4f074f1..a6a58aa 100644
--- a/va/va.c
+++ b/va/va.c
@@ -402,6 +402,7 @@
                 int minor;
             } compatible_versions[] = {
                 { VA_MAJOR_VERSION, VA_MINOR_VERSION },
+                { VA_MAJOR_VERSION, 1 },
                 { VA_MAJOR_VERSION, 0 },
                 { -1, }
             };