don't register adpcm encoders which are not implemented

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10894 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b1e0acf020d5a530e2b67ac265aa54daaec1c00b..0ae65c6a67eb97f2261363087e627dc8ae34dfed 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -259,13 +259,10 @@ OBJS-$(CONFIG_PCM_MULAW_DECODER)       += pcm.o
 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)       += 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
-OBJS-$(CONFIG_ADPCM_EA_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)     += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_R2_DECODER)     += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_R3_DECODER)     += adpcm.o
@@ -273,32 +270,23 @@ OBJS-$(CONFIG_ADPCM_G726_DECODER)      += g726.o
 OBJS-$(CONFIG_ADPCM_G726_ENCODER)      += g726.o
 OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)   += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER)   += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER) += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER) += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER)    += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER)    += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER) += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER)    += adpcm.o
-OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER)    += adpcm.o
 OBJS-$(CONFIG_ADPCM_MS_DECODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_MS_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER)   += adpcm.o
-OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER)   += adpcm.o
-OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)   += adpcm.o
-OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER)   += adpcm.o
 OBJS-$(CONFIG_ADPCM_SWF_DECODER)       += adpcm.o
 OBJS-$(CONFIG_ADPCM_SWF_ENCODER)       += adpcm.o
 OBJS-$(CONFIG_ADPCM_THP_DECODER)       += adpcm.o
 OBJS-$(CONFIG_ADPCM_XA_DECODER)        += adpcm.o
-OBJS-$(CONFIG_ADPCM_XA_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)    += adpcm.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
 

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 796d32e144247dc95e6569a4996adaf8a6be48ce..c9596665529bda61129b01e7b07f5b9836f93f97 100644 (file)
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1555,28 +1555,28 @@ AVCodec name ## _decoder = {                    \
 #define ADPCM_CODEC(id, name)                   \
 ADPCM_ENCODER(id,name) ADPCM_DECODER(id,name)
 
-ADPCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm);
-ADPCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
-ADPCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
-ADPCM_CODEC(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
-ADPCM_CODEC(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
-ADPCM_CODEC(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
+ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm);
+ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct);
+ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea);
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
 ADPCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav);
-ADPCM_CODEC(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws);
+ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws);
 ADPCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
-ADPCM_CODEC(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4);
-ADPCM_CODEC(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3);
-ADPCM_CODEC(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2);
+ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4);
+ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3);
+ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2);
 ADPCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);
-ADPCM_CODEC(CODEC_ID_ADPCM_THP, adpcm_thp);
-ADPCM_CODEC(CODEC_ID_ADPCM_XA, adpcm_xa);
+ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp);
+ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa);
 ADPCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha);
 
 #undef ADPCM_CODEC

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 32b9f705e23eadd99f6d739f1ae993061cf3ac49..f929c58f13bcb69364e7c85d8e303e9cf57fc480 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -243,30 +243,30 @@ void avcodec_register_all(void)
     REGISTER_DECODER (XAN_DPCM, xan_dpcm);
 
     /* adpcm codecs */
-    REGISTER_ENCDEC  (ADPCM_4XM, adpcm_4xm);
+    REGISTER_DECODER (ADPCM_4XM, adpcm_4xm);
     REGISTER_ENCDEC  (ADPCM_ADX, adpcm_adx);
-    REGISTER_ENCDEC  (ADPCM_CT, adpcm_ct);
-    REGISTER_ENCDEC  (ADPCM_EA, adpcm_ea);
+    REGISTER_DECODER (ADPCM_CT, adpcm_ct);
+    REGISTER_DECODER (ADPCM_EA, adpcm_ea);
     REGISTER_DECODER (ADPCM_EA_R1, adpcm_ea_r1);
     REGISTER_DECODER (ADPCM_EA_R2, adpcm_ea_r2);
     REGISTER_DECODER (ADPCM_EA_R3, adpcm_ea_r3);
     REGISTER_ENCDEC  (ADPCM_G726, adpcm_g726);
     REGISTER_DECODER (ADPCM_IMA_AMV, adpcm_ima_amv);
-    REGISTER_ENCDEC  (ADPCM_IMA_DK3, adpcm_ima_dk3);
-    REGISTER_ENCDEC  (ADPCM_IMA_DK4, adpcm_ima_dk4);
+    REGISTER_DECODER (ADPCM_IMA_DK3, adpcm_ima_dk3);
+    REGISTER_DECODER (ADPCM_IMA_DK4, adpcm_ima_dk4);
     REGISTER_DECODER (ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs);
     REGISTER_DECODER (ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead);
-    REGISTER_ENCDEC  (ADPCM_IMA_QT, adpcm_ima_qt);
-    REGISTER_ENCDEC  (ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
+    REGISTER_DECODER (ADPCM_IMA_QT, adpcm_ima_qt);
+    REGISTER_DECODER (ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg);
     REGISTER_ENCDEC  (ADPCM_IMA_WAV, adpcm_ima_wav);
-    REGISTER_ENCDEC  (ADPCM_IMA_WS, adpcm_ima_ws);
+    REGISTER_DECODER (ADPCM_IMA_WS, adpcm_ima_ws);
     REGISTER_ENCDEC  (ADPCM_MS, adpcm_ms);
-    REGISTER_ENCDEC  (ADPCM_SBPRO_2, adpcm_sbpro_2);
-    REGISTER_ENCDEC  (ADPCM_SBPRO_3, adpcm_sbpro_3);
-    REGISTER_ENCDEC  (ADPCM_SBPRO_4, adpcm_sbpro_4);
+    REGISTER_DECODER (ADPCM_SBPRO_2, adpcm_sbpro_2);
+    REGISTER_DECODER (ADPCM_SBPRO_3, adpcm_sbpro_3);
+    REGISTER_DECODER (ADPCM_SBPRO_4, adpcm_sbpro_4);
     REGISTER_ENCDEC  (ADPCM_SWF, adpcm_swf);
     REGISTER_DECODER (ADPCM_THP, adpcm_thp);
-    REGISTER_ENCDEC  (ADPCM_XA, adpcm_xa);
+    REGISTER_DECODER (ADPCM_XA, adpcm_xa);
     REGISTER_ENCDEC  (ADPCM_YAMAHA, adpcm_yamaha);
 
     /* subtitles */