Mercurial > libavcodec.hg
comparison avcodec.h @ 8615:2a2318411d9d libavcodec
added demuxer for FunCom ISS audio files,
extended ADPCM decoder by ISS specific IMA variant
author | stefang |
---|---|
date | Sat, 17 Jan 2009 20:08:43 +0000 |
parents | 2ca51be7dad8 |
children | ce9b3d6a0abf |
comparison
equal
deleted
inserted
replaced
8614:ff10b38304d2 | 8615:2a2318411d9d |
---|---|
28 | 28 |
29 | 29 |
30 #include "libavutil/avutil.h" | 30 #include "libavutil/avutil.h" |
31 | 31 |
32 #define LIBAVCODEC_VERSION_MAJOR 52 | 32 #define LIBAVCODEC_VERSION_MAJOR 52 |
33 #define LIBAVCODEC_VERSION_MINOR 10 | 33 #define LIBAVCODEC_VERSION_MINOR 11 |
34 #define LIBAVCODEC_VERSION_MICRO 0 | 34 #define LIBAVCODEC_VERSION_MICRO 0 |
35 | 35 |
36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
37 LIBAVCODEC_VERSION_MINOR, \ | 37 LIBAVCODEC_VERSION_MINOR, \ |
38 LIBAVCODEC_VERSION_MICRO) | 38 LIBAVCODEC_VERSION_MICRO) |
243 CODEC_ID_ADPCM_EA_R2, | 243 CODEC_ID_ADPCM_EA_R2, |
244 CODEC_ID_ADPCM_IMA_EA_SEAD, | 244 CODEC_ID_ADPCM_IMA_EA_SEAD, |
245 CODEC_ID_ADPCM_IMA_EA_EACS, | 245 CODEC_ID_ADPCM_IMA_EA_EACS, |
246 CODEC_ID_ADPCM_EA_XAS, | 246 CODEC_ID_ADPCM_EA_XAS, |
247 CODEC_ID_ADPCM_EA_MAXIS_XA, | 247 CODEC_ID_ADPCM_EA_MAXIS_XA, |
248 CODEC_ID_ADPCM_IMA_ISS, | |
248 | 249 |
249 /* AMR */ | 250 /* AMR */ |
250 CODEC_ID_AMR_NB= 0x12000, | 251 CODEC_ID_AMR_NB= 0x12000, |
251 CODEC_ID_AMR_WB, | 252 CODEC_ID_AMR_WB, |
252 | 253 |