diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 14:10:39 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 14:11:33 +0400 |
commit | 69ea65b46f1a101f9a4f2c914c75b752122e7cbe (patch) | |
tree | 19e9bfa95c01a5739802ddd1704e1486a6cbd4ad /libavcodec/version.h | |
parent | a0fb6083967afcd7f2c43ab3ff1e510912644daa (diff) | |
parent | 3e5898782dce60334ab294821ca00b19c648cf66 (diff) |
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
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 50eee90579..75b15a7465 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 23 +#define LIBAVCODEC_VERSION_MINOR 24 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |