diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:33:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:47:32 +0200 |
commit | 55219a78c7d04d1937384366ba911c5d75c5c1e4 (patch) | |
tree | 85efaa581ea0a51328bb8dda18727b84021b4c80 /libavcodec/version.h | |
parent | 4df3cf90bf7a54793e90304bd1b6c7599673f36a (diff) | |
parent | 7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7 (diff) |
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
Hap decoder and encoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r-- | libavcodec/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index f4d68bd85b..ba66129b2c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 42 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 43 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |