Mercurial > libavcodec.hg

comparison avcodec.h @ 2794:ed1ab1566353 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com)
author michael
date Fri, 15 Jul 2005 06:51:36 +0000
parents 0a8c847ad5e7
children 95c35706acbb
comparison
equal deleted inserted replaced
2793:ae85da6c5c2f 2794:ed1ab1566353
135 CODEC_ID_ADPCM_ADX, 135 CODEC_ID_ADPCM_ADX,
136 CODEC_ID_ADPCM_EA, 136 CODEC_ID_ADPCM_EA,
137 CODEC_ID_ADPCM_G726, 137 CODEC_ID_ADPCM_G726,
138 CODEC_ID_ADPCM_CT, 138 CODEC_ID_ADPCM_CT,
139 CODEC_ID_ADPCM_SWF, 139 CODEC_ID_ADPCM_SWF,
140 CODEC_ID_ADPCM_YAMAHA,
140 141
141 /* AMR */ 142 /* AMR */
142 CODEC_ID_AMR_NB= 0x12000, 143 CODEC_ID_AMR_NB= 0x12000,
143 CODEC_ID_AMR_WB, 144 CODEC_ID_AMR_WB,
144 145
2117 PCM_CODEC(CODEC_ID_ADPCM_ADX, adpcm_adx); 2118 PCM_CODEC(CODEC_ID_ADPCM_ADX, adpcm_adx);
2118 PCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea); 2119 PCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
2119 PCM_CODEC(CODEC_ID_ADPCM_G726, adpcm_g726); 2120 PCM_CODEC(CODEC_ID_ADPCM_G726, adpcm_g726);
2120 PCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct); 2121 PCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
2121 PCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf); 2122 PCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);
2123 PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha);
2122 2124
2123 #undef PCM_CODEC 2125 #undef PCM_CODEC
2124 2126
2125 /* dummy raw video codec */ 2127 /* dummy raw video codec */
2126 extern AVCodec rawvideo_encoder; 2128 extern AVCodec rawvideo_encoder;