Mercurial > libavcodec.hg
changeset 3445:2d042ed9dd2c libavcodec
make the adx adpcm codec available
| author | mru |
|---|---|
| date | Sat, 08 Jul 2006 22:31:14 +0000 |
| parents | d50b2d024968 |
| children | d4992082c7f1 |
| files | Makefile adpcm.c adx.c |
| diffstat | 3 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Jul 08 21:15:50 2006 +0000 +++ b/Makefile Sat Jul 08 22:31:14 2006 +0000 @@ -165,8 +165,8 @@ 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
--- a/adpcm.c Sat Jul 08 21:15:50 2006 +0000 +++ b/adpcm.c Sat Jul 08 22:31:14 2006 +0000 @@ -1357,7 +1357,6 @@ 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);
--- a/adx.c Sat Jul 08 21:15:50 2006 +0000 +++ b/adx.c Sat Jul 08 22:31:14 2006 +0000 @@ -385,8 +385,8 @@ } #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 @@ }; #endif //CONFIG_ENCODERS -AVCodec adx_adpcm_decoder = { - "adx_adpcm", +AVCodec adpcm_adx_decoder = { + "adpcm_adx", CODEC_TYPE_AUDIO, CODEC_ID_ADPCM_ADX, sizeof(ADXContext),