diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
commit | 268ff17cb785c3ae94be0aca31ed8709e149b487 (patch) | |
tree | 0d8f9f3b52d0430765ef2bfe389cbea1149b4ca8 /libavutil/version.h | |
parent | cf16b459a873b990efc10d93e9912ab01b8a0fba (diff) | |
parent | c48456166e95648719a8be8f8613f9dee98205c1 (diff) |
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 897384aecf..4d710dd4e2 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,8 +56,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 20 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 21 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |