summaryrefslogtreecommitdiff
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-14 13:49:55 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-14 13:49:55 +0100
commit28abb216cbd5736d65973165b830c08815ce0227 (patch)
tree992cf32eb3eb44dd2007c4108e9564c3317725e6 /libavutil/version.h
parenteb2da769bddf7e8f4f3202162dacd17c77770dd8 (diff)
parent551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4 (diff)
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4': lavu: VAAPI hwcontext implementation Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r--libavutil/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h
index 7d8fdb3b81..cf7458ec23 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -64,7 +64,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 21
+#define LIBAVUTIL_VERSION_MINOR 22
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \