Revision 7239fb57

View differences:

libavcodec/Makefile
165 165

  
166 166
OBJS-$(CONFIG_ADPCM_4XM_DECODER)       += adpcm.o
167 167
OBJS-$(CONFIG_ADPCM_4XM_ENCODER)       += adpcm.o
168
OBJS-$(CONFIG_ADPCM_ADX_DECODER)       += adpcm.o
169
OBJS-$(CONFIG_ADPCM_ADX_ENCODER)       += adpcm.o
168
OBJS-$(CONFIG_ADPCM_ADX_DECODER)       += adx.o
169
OBJS-$(CONFIG_ADPCM_ADX_ENCODER)       += adx.o
170 170
OBJS-$(CONFIG_ADPCM_CT_DECODER)        += adpcm.o
171 171
OBJS-$(CONFIG_ADPCM_CT_ENCODER)        += adpcm.o
172 172
OBJS-$(CONFIG_ADPCM_EA_DECODER)        += adpcm.o
libavcodec/adpcm.c
1357 1357
ADPCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
1358 1358
ADPCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm);
1359 1359
ADPCM_CODEC(CODEC_ID_ADPCM_XA, adpcm_xa);
1360
ADPCM_CODEC(CODEC_ID_ADPCM_ADX, adpcm_adx);
1361 1360
ADPCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
1362 1361
ADPCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
1363 1362
ADPCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);
libavcodec/adx.c
385 385
}
386 386

  
387 387
#ifdef CONFIG_ENCODERS
388
AVCodec adx_adpcm_encoder = {
389
    "adx_adpcm",
388
AVCodec adpcm_adx_encoder = {
389
    "adpcm_adx",
390 390
    CODEC_TYPE_AUDIO,
391 391
    CODEC_ID_ADPCM_ADX,
392 392
    sizeof(ADXContext),
......
397 397
};
398 398
#endif //CONFIG_ENCODERS
399 399

  
400
AVCodec adx_adpcm_decoder = {
401
    "adx_adpcm",
400
AVCodec adpcm_adx_decoder = {
401
    "adpcm_adx",
402 402
    CODEC_TYPE_AUDIO,
403 403
    CODEC_ID_ADPCM_ADX,
404 404
    sizeof(ADXContext),

Also available in: Unified diff