diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:33:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:33:51 +0100 |
commit | 7a6034805305cb5d6a3d755d774f0ad09119049e (patch) | |
tree | 7062d51b46c39f95dec61723b03f40158285c11b /libavutil/version.h | |
parent | 64f73acd1d3853e55a7cd7631987dfd83c4171e7 (diff) | |
parent | 7e244c68600f479270e979258e389ed5240885fb (diff) |
Merge commit '7e244c68600f479270e979258e389ed5240885fb'
* commit '7e244c68600f479270e979258e389ed5240885fb':
avframe: add codec-independent stereoscopic metadata
Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b1a9afa842..f698e41bbc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 57 +#define LIBAVUTIL_VERSION_MINOR 58 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |