[FFmpeg-devel] [PATCH] avcodec: remove vima decoder

[Paul B Mahol]

Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavcodec/Makefile     |  1 -
 libavcodec/allcodecs.c  |  1 -
 libavcodec/avcodec.h    |  1 -
 libavcodec/codec_desc.c |  7 -------
 libavcodec/vima.c       | 10 ----------
 5 files changed, 20 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7d3b423..f144699 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -651,7 +651,6 @@ OBJS-$(CONFIG_ADPCM_VIMA_DECODER)         += vima.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_XA_DECODER)           += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)       += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcmenc.o adpcm_data.o
-OBJS-$(CONFIG_VIMA_DECODER)               += vima.o adpcm_data.o
 
 # hardware accelerators
 OBJS-$(CONFIG_DXVA2)                      += dxva2.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 2fe3609..0d5a22f 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -477,7 +477,6 @@ void avcodec_register_all(void)
     REGISTER_DECODER(ADPCM_VIMA,        adpcm_vima);
     REGISTER_DECODER(ADPCM_XA,          adpcm_xa);
     REGISTER_ENCDEC (ADPCM_YAMAHA,      adpcm_yamaha);
-    REGISTER_DECODER(VIMA,              vima);
 
     /* subtitles */
     REGISTER_ENCDEC (SSA,               ssa);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 87b53a2..947ceaa 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -390,7 +390,6 @@ enum AVCodecID {
     AV_CODEC_ID_ADPCM_IMA_APC,
     AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
     AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'),
-    AV_CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
     AV_CODEC_ID_ADPCM_AFC  = MKBETAG('A','F','C',' '),
     AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
     AV_CODEC_ID_ADPCM_DTK  = MKBETAG('D','T','K',' '),
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 0af66f4..ab4075e 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2808,13 +2808,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
     },
 
     {
-        .id        = AV_CODEC_ID_VIMA,
-        .type      = AVMEDIA_TYPE_AUDIO,
-        .name      = "vima",
-        .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio (deprecated id)"),
-        .props     = AV_CODEC_PROP_LOSSY,
-    },
-    {
         .id        = AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
         .type      = AVMEDIA_TYPE_AUDIO,
         .name      = "adpcm_vima_deprecated",
diff --git a/libavcodec/vima.c b/libavcodec/vima.c
index ba3f07a..5982508 100644
--- a/libavcodec/vima.c
+++ b/libavcodec/vima.c
@@ -216,13 +216,3 @@ AVCodec ff_adpcm_vima_decoder = {
     .decode       = decode_frame,
     .capabilities = CODEC_CAP_DR1,
 };
-
-AVCodec ff_vima_decoder = {
-    .name         = "vima",
-    .long_name    = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"),
-    .type         = AVMEDIA_TYPE_AUDIO,
-    .id           = AV_CODEC_ID_ADPCM_VIMA,
-    .init         = decode_init,
-    .decode       = decode_frame,
-    .capabilities = CODEC_CAP_DR1,
-};
-- 
1.7.11.2