diff options
| author | Martin Storsjö <martin@martin.st> | 2010-09-09 19:21:16 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-09-09 19:21:16 +0000 |
| commit | 58e37eafce10bbcf10b111cafb7ba8586c76ef4b (patch) | |
| tree | 54bd919cd566792fc1acb80c4cc06425efec892d /libavcodec/avcodec.h | |
| parent | a3f0d2b9674b4bbbdb6eb28a1e600ba324a5853b (diff) | |
Add G.722 ADPCM audio decoder
Originally committed as revision 25086 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 84ab1b485f..484880e818 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,8 +31,8 @@ #include "libavutil/cpu.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 87 -#define LIBAVCODEC_VERSION_MICRO 5 +#define LIBAVCODEC_VERSION_MINOR 88 +#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -284,6 +284,7 @@ enum CodecID { CODEC_ID_ADPCM_EA_XAS, CODEC_ID_ADPCM_EA_MAXIS_XA, CODEC_ID_ADPCM_IMA_ISS, + CODEC_ID_ADPCM_G722, /* AMR */ CODEC_ID_AMR_NB= 0x12000, |