diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:53:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:53:48 +0200 |
commit | bb44f7d5d7e48bd67fa24fbec4a28f9890e444aa (patch) | |
tree | 863b54eb4dd13a87d11869ac64730be4ed9c2397 /libavutil/version.h | |
parent | 7eb959bf0b961e308e3068f161ee94e82e02355d (diff) | |
parent | 5a419b2dd1881889d436f55741fd3ff3f9f436c4 (diff) |
Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'
* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4':
pixdesc: return color properties names
Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.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 ae5dd65a4e..6db2dd7096 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,8 +56,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 9 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 10 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |