Mercurial > libavcodec.hg

comparison avcodec.h @ 12478:5942c42c44e5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add G.722 ADPCM audio decoder
author mstorsjo
date Thu, 09 Sep 2010 19:21:16 +0000
parents 9fef0a8ddd63
children e1a4ceb96a07
comparison
equal deleted inserted replaced
12477:c707911013ad 12478:5942c42c44e5
29 #include <errno.h> 29 #include <errno.h>
30 #include "libavutil/avutil.h" 30 #include "libavutil/avutil.h"
31 #include "libavutil/cpu.h" 31 #include "libavutil/cpu.h"
32 32
33 #define LIBAVCODEC_VERSION_MAJOR 52 33 #define LIBAVCODEC_VERSION_MAJOR 52
34 #define LIBAVCODEC_VERSION_MINOR 87 34 #define LIBAVCODEC_VERSION_MINOR 88
35 #define LIBAVCODEC_VERSION_MICRO 5 35 #define LIBAVCODEC_VERSION_MICRO 0
36 36
37 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 37 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
38 LIBAVCODEC_VERSION_MINOR, \ 38 LIBAVCODEC_VERSION_MINOR, \
39 LIBAVCODEC_VERSION_MICRO) 39 LIBAVCODEC_VERSION_MICRO)
40 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \ 40 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
282 CODEC_ID_ADPCM_IMA_EA_SEAD, 282 CODEC_ID_ADPCM_IMA_EA_SEAD,
283 CODEC_ID_ADPCM_IMA_EA_EACS, 283 CODEC_ID_ADPCM_IMA_EA_EACS,
284 CODEC_ID_ADPCM_EA_XAS, 284 CODEC_ID_ADPCM_EA_XAS,
285 CODEC_ID_ADPCM_EA_MAXIS_XA, 285 CODEC_ID_ADPCM_EA_MAXIS_XA,
286 CODEC_ID_ADPCM_IMA_ISS, 286 CODEC_ID_ADPCM_IMA_ISS,
287 CODEC_ID_ADPCM_G722,
287 288
288 /* AMR */ 289 /* AMR */
289 CODEC_ID_AMR_NB= 0x12000, 290 CODEC_ID_AMR_NB= 0x12000,
290 CODEC_ID_AMR_WB, 291 CODEC_ID_AMR_WB,
291 292