diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 15:33:37 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 15:33:37 +0300 |
| commit | afccfaf26ac8fae3257302a74110b40615dfa05d (patch) | |
| tree | 8d624efea672bfa209398c7157ab9fdcc123c49e /libavutil/version.h | |
| parent | 7af788aa625735fa9b3ff2e647f497c62127e855 (diff) | |
| parent | b1f01e85a92d401a9b29c79f23db36b7685e8c09 (diff) | |
Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
lavu: add a way to query hwcontext frame constraints
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index f1e9e4006a..7d8fdb3b81 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -64,7 +64,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 20 +#define LIBAVUTIL_VERSION_MINOR 21 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |