summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2017-06-01 15:26:46 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2017-09-27 12:48:16 +0800
commitd6db61ff7c74307ff845c8252205b0dadc23aba1 (patch)
tree5e449e4703c6552c90426a0005222bbf869976b8
parentd1826a955363375370569636d32645bf41a52ebf (diff)
downloadlibva-d6db61ff7c74307ff845c8252205b0dadc23aba1.tar.gz
libva 2.0.0.pre1 for development
ABI was broken in the previous versions, so we will bump the VA API version to 1.0.0 and library version to 2.0.0 for next release. Some data structures will be changed or removed in the next commits Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
-rw-r--r--configure.ac12
-rw-r--r--va/va.c8
2 files changed, 6 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index d723cfe..923ffdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,14 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# VA-API version
-# - increment major for any ABI change (which shall not occur!)
+# - increment major for any ABI change
# - increment minor for any interface change (e.g. new/modified function)
# - increment micro for any other change (new flag, new codec definition, etc.)
# - 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], [40])
-m4_define([va_api_micro_version], [1])
+m4_define([va_api_major_version], [1])
+m4_define([va_api_minor_version], [0])
+m4_define([va_api_micro_version], [0])
m4_define([va_api_version],
[va_api_major_version.va_api_minor_version.va_api_micro_version])
@@ -41,8 +41,8 @@ m4_define([va_api_version],
# - increment micro for any library release
# - 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], [4])
+m4_define([libva_minor_version], [m4_eval(va_api_minor_version)])
+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 0a129a9..813a552 100644
--- a/va/va.c
+++ b/va/va.c
@@ -331,14 +331,6 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
int minor;
} compatible_versions[] = {
{ VA_MAJOR_VERSION, VA_MINOR_VERSION },
- { 0, 39 },
- { 0, 38 },
- { 0, 37 },
- { 0, 36 },
- { 0, 35 },
- { 0, 34 },
- { 0, 33 },
- { 0, 32 },
{ -1, }
};