diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 14:14:39 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 14:14:39 +0400 |
| commit | e4eab2d9bde330b9893a3291cb0d00c626a9ee8c (patch) | |
| tree | db03f89ac9f81ca2bcc685adf86e336cfacfde9e /libavcodec/version.h | |
| parent | 6bf6d6ad498d760bb60b6973789ebbf9758c999e (diff) | |
| parent | f544c586364e157e52ecc8697bee77d342150999 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead
Conflicts:
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 4b9a4b26ab..50eee90579 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 22 +#define LIBAVCODEC_VERSION_MINOR 23 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -97,5 +97,8 @@ #ifndef FF_API_BUFS_VDPAU #define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_VOXWARE +#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |