diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-08 22:31:14 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-08 22:31:14 +0000 |
| commit | 7239fb57388b2f0249ba96d664fdd75841007762 (patch) | |
| tree | 9af1ebfcc459685e432cf583d40708e03b07f720 /libavcodec | |
| parent | 327dcfd3152f4b18c747059650d99f8d8448fe28 (diff) | |
| download | ffmpeg-7239fb57388b2f0249ba96d664fdd75841007762.tar.gz | |
make the adx adpcm codec available
Originally committed as revision 5679 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/adpcm.c | 1 | ||||
| -rw-r--r-- | libavcodec/adx.c | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6dc0874751..97d1e218d5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 22a710d4aa..796cd267c3 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -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); diff --git a/libavcodec/adx.c b/libavcodec/adx.c index fb91f652cf..c8c7855903 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -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), |