Revision f6e2300f

View differences:

libavcodec/Makefile
259 259
OBJS-$(CONFIG_PCM_MULAW_ENCODER)       += pcm.o
260 260

  
261 261
OBJS-$(CONFIG_ADPCM_4XM_DECODER)       += adpcm.o
262
OBJS-$(CONFIG_ADPCM_4XM_ENCODER)       += adpcm.o
263 262
OBJS-$(CONFIG_ADPCM_ADX_DECODER)       += adx.o
264 263
OBJS-$(CONFIG_ADPCM_ADX_ENCODER)       += adx.o
265 264
OBJS-$(CONFIG_ADPCM_CT_DECODER)        += adpcm.o
266
OBJS-$(CONFIG_ADPCM_CT_ENCODER)        += adpcm.o
267 265
OBJS-$(CONFIG_ADPCM_EA_DECODER)        += adpcm.o
268
OBJS-$(CONFIG_ADPCM_EA_ENCODER)        += adpcm.o
269 266
OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)     += adpcm.o
270 267
OBJS-$(CONFIG_ADPCM_EA_R2_DECODER)     += adpcm.o
271 268
OBJS-$(CONFIG_ADPCM_EA_R3_DECODER)     += adpcm.o
......
273 270
OBJS-$(CONFIG_ADPCM_G726_ENCODER)      += g726.o
274 271
OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER)   += adpcm.o
275 272
OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)   += adpcm.o
276
OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER)   += adpcm.o
277 273
OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER)   += adpcm.o
278
OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER)   += adpcm.o
279 274
OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER) += adpcm.o
280 275
OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER) += adpcm.o
281 276
OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER)    += adpcm.o
282
OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER)    += adpcm.o
283 277
OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o
284
OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER) += adpcm.o
285 278
OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER)   += adpcm.o
286 279
OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)   += adpcm.o
287 280
OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER)    += adpcm.o
288
OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER)    += adpcm.o
289 281
OBJS-$(CONFIG_ADPCM_MS_DECODER)        += adpcm.o
290 282
OBJS-$(CONFIG_ADPCM_MS_ENCODER)        += adpcm.o
291 283
OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER)   += adpcm.o
292
OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER)   += adpcm.o
293 284
OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER)   += adpcm.o
294
OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER)   += adpcm.o
295 285
OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)   += adpcm.o
296
OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER)   += adpcm.o
297 286
OBJS-$(CONFIG_ADPCM_SWF_DECODER)       += adpcm.o
298 287
OBJS-$(CONFIG_ADPCM_SWF_ENCODER)       += adpcm.o
299 288
OBJS-$(CONFIG_ADPCM_THP_DECODER)       += adpcm.o
300 289
OBJS-$(CONFIG_ADPCM_XA_DECODER)        += adpcm.o
301
OBJS-$(CONFIG_ADPCM_XA_ENCODER)        += adpcm.o
302 290
OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)    += adpcm.o
303 291
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
304 292

  
libavcodec/adpcm.c
1555 1555
#define ADPCM_CODEC(id, name)                   \
1556 1556
ADPCM_ENCODER(id,name) ADPCM_DECODER(id,name)
1557 1557

  
1558
ADPCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm);
1559
ADPCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
1560
ADPCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
1561
ADPCM_CODEC(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
1562
ADPCM_CODEC(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
1563
ADPCM_CODEC(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3);
1564
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv);
1565
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3);
1566
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4);
1567
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
1568
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead);
1569
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
1570
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
1558
ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm);
1559
ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct);
1560
ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea);
1561
ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
1562
ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
1563
ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3);
1564
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv);
1565
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3);
1566
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4);
1567
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
1568
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead);
1569
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
1570
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
1571 1571
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav);
1572
ADPCM_CODEC(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws);
1572
ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws);
1573 1573
ADPCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
1574
ADPCM_CODEC(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4);
1575
ADPCM_CODEC(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3);
1576
ADPCM_CODEC(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2);
1574
ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4);
1575
ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3);
1576
ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2);
1577 1577
ADPCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);
1578
ADPCM_CODEC(CODEC_ID_ADPCM_THP, adpcm_thp);
1579
ADPCM_CODEC(CODEC_ID_ADPCM_XA, adpcm_xa);
1578
ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp);
1579
ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa);
1580 1580
ADPCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha);
1581 1581

  
1582 1582
#undef ADPCM_CODEC
libavcodec/allcodecs.c
243 243
    REGISTER_DECODER (XAN_DPCM, xan_dpcm);
244 244

  
245 245
    /* adpcm codecs */
246
    REGISTER_ENCDEC  (ADPCM_4XM, adpcm_4xm);
246
    REGISTER_DECODER (ADPCM_4XM, adpcm_4xm);
247 247
    REGISTER_ENCDEC  (ADPCM_ADX, adpcm_adx);
248
    REGISTER_ENCDEC  (ADPCM_CT, adpcm_ct);
249
    REGISTER_ENCDEC  (ADPCM_EA, adpcm_ea);
248
    REGISTER_DECODER (ADPCM_CT, adpcm_ct);
249
    REGISTER_DECODER (ADPCM_EA, adpcm_ea);
250 250
    REGISTER_DECODER (ADPCM_EA_R1, adpcm_ea_r1);
251 251
    REGISTER_DECODER (ADPCM_EA_R2, adpcm_ea_r2);
252 252
    REGISTER_DECODER (ADPCM_EA_R3, adpcm_ea_r3);
253 253
    REGISTER_ENCDEC  (ADPCM_G726, adpcm_g726);
254 254
    REGISTER_DECODER (ADPCM_IMA_AMV, adpcm_ima_amv);
255
    REGISTER_ENCDEC  (ADPCM_IMA_DK3, adpcm_ima_dk3);
256
    REGISTER_ENCDEC  (ADPCM_IMA_DK4, adpcm_ima_dk4);
255
    REGISTER_DECODER (ADPCM_IMA_DK3, adpcm_ima_dk3);
256
    REGISTER_DECODER (ADPCM_IMA_DK4, adpcm_ima_dk4);
257 257
    REGISTER_DECODER (ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
258 258
    REGISTER_DECODER (ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead);
259
    REGISTER_ENCDEC  (ADPCM_IMA_QT, adpcm_ima_qt);
260
    REGISTER_ENCDEC  (ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
259
    REGISTER_DECODER (ADPCM_IMA_QT, adpcm_ima_qt);
260
    REGISTER_DECODER (ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
261 261
    REGISTER_ENCDEC  (ADPCM_IMA_WAV, adpcm_ima_wav);
262
    REGISTER_ENCDEC  (ADPCM_IMA_WS, adpcm_ima_ws);
262
    REGISTER_DECODER (ADPCM_IMA_WS, adpcm_ima_ws);
263 263
    REGISTER_ENCDEC  (ADPCM_MS, adpcm_ms);
264
    REGISTER_ENCDEC  (ADPCM_SBPRO_2, adpcm_sbpro_2);
265
    REGISTER_ENCDEC  (ADPCM_SBPRO_3, adpcm_sbpro_3);
266
    REGISTER_ENCDEC  (ADPCM_SBPRO_4, adpcm_sbpro_4);
264
    REGISTER_DECODER (ADPCM_SBPRO_2, adpcm_sbpro_2);
265
    REGISTER_DECODER (ADPCM_SBPRO_3, adpcm_sbpro_3);
266
    REGISTER_DECODER (ADPCM_SBPRO_4, adpcm_sbpro_4);
267 267
    REGISTER_ENCDEC  (ADPCM_SWF, adpcm_swf);
268 268
    REGISTER_DECODER (ADPCM_THP, adpcm_thp);
269
    REGISTER_ENCDEC  (ADPCM_XA, adpcm_xa);
269
    REGISTER_DECODER (ADPCM_XA, adpcm_xa);
270 270
    REGISTER_ENCDEC  (ADPCM_YAMAHA, adpcm_yamaha);
271 271

  
272 272
    /* subtitles */

Also available in: Unified diff