RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make the adx adpcm codec available 

Originally committed as revision 5679 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-07-08 22:31:14 +00:00
parent 327dcfd315
commit 7239fb5738
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/Makefile
View File

@ -165,8 +165,8 @@ OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o
OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_4XM_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adx.o
OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adx.o
OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_CT_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o

1
libavcodec/adpcm.c
View File

@ -1357,7 +1357,6 @@ ADPCM_CODEC(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
ADPCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
ADPCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm);
ADPCM_CODEC(CODEC_ID_ADPCM_XA, adpcm_xa);
ADPCM_CODEC(CODEC_ID_ADPCM_ADX, adpcm_adx);
ADPCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
ADPCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
ADPCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);

8
libavcodec/adx.c
View File

@ -385,8 +385,8 @@ static int adx_decode_frame(AVCodecContext *avctx,
}
#ifdef CONFIG_ENCODERS
AVCodec adx_adpcm_encoder = {
"adx_adpcm",
AVCodec adpcm_adx_encoder = {
"adpcm_adx",
CODEC_TYPE_AUDIO,
CODEC_ID_ADPCM_ADX,
sizeof(ADXContext),
@ -397,8 +397,8 @@ AVCodec adx_adpcm_encoder = {
};
#endif //CONFIG_ENCODERS
AVCodec adx_adpcm_decoder = {
"adx_adpcm",
AVCodec adpcm_adx_decoder = {
"adpcm_adx",
CODEC_TYPE_AUDIO,
CODEC_ID_ADPCM_ADX,
sizeof(ADXContext),