diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 14:42:31 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 14:47:26 +0400 |
commit | e5cdf9c03b1ef0913dad117b0e5d343a525f6d10 (patch) | |
tree | 82a2beb4104fa6f9c5d8d6a862b4165be227072c /libavcodec/version.h | |
parent | 5c43f3ddea40fc76264d647750f6986a9247aead (diff) | |
parent | 2d66a58ccde05e764594bd7e5f0f9244634d0b2c (diff) |
Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
Go2Webinar decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index b1fcbd05cd..e7e2cacef8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 14 +#define LIBAVCODEC_VERSION_MINOR 15 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |