diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-10-15 03:20:40 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-10-15 03:20:40 +0000 |
| commit | fc3847771595fb52e01363d64b0b6b996ef0dfdc (patch) | |
| tree | cd460d7005a53b11615beaf894bf8ecf4cdf10b8 /libavcodec/allcodecs.c | |
| parent | f19af812a32c1398d48c3550d11dbc6aafbb2bfc (diff) | |
activate the XA and ADX ADPCM codecs
Originally committed as revision 2385 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b9f6d2b914..2626f944e6 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -146,20 +146,30 @@ void avcodec_register_all(void) #ifdef AMR_NB register_avcodec(&amr_nb_decoder); +#ifdef CONFIG_ENCODERS register_avcodec(&amr_nb_encoder); +#endif //CONFIG_ENCODERS #endif /* AMR_NB */ #ifdef AMR_WB register_avcodec(&amr_wb_decoder); +#ifdef CONFIG_ENCODERS register_avcodec(&amr_wb_encoder); +#endif //CONFIG_ENCODERS #endif /* AMR_WB */ /* pcm codecs */ +#ifdef CONFIG_ENCODERS #define PCM_CODEC(id, name) \ register_avcodec(& name ## _encoder); \ register_avcodec(& name ## _decoder); \ +#else +#define PCM_CODEC(id, name) \ + register_avcodec(& name ## _decoder); +#endif + PCM_CODEC(CODEC_ID_PCM_S16LE, pcm_s16le); PCM_CODEC(CODEC_ID_PCM_S16BE, pcm_s16be); PCM_CODEC(CODEC_ID_PCM_U16LE, pcm_u16le); @@ -177,6 +187,8 @@ PCM_CODEC(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4); PCM_CODEC(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws); PCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms); PCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm); +PCM_CODEC(CODEC_ID_ADPCM_XA, adpcm_xa); +PCM_CODEC(CODEC_ID_ADPCM_ADX, adpcm_adx); #undef PCM_CODEC } |