avcodec: remove missing bits from deprecated VIMA decoder

Signed-off-by: James Almer <jamrial@gmail.com>
pull/148/head
James Almer 9 years ago
parent bdbab4a351
commit f9fd879877
  1. 3
      libavcodec/allcodecs.c
  2. 9
      libavcodec/codec_desc.c
  3. 12
      libavcodec/vima.c

@ -517,9 +517,6 @@ void avcodec_register_all(void)
REGISTER_DECODER(ADPCM_VIMA, adpcm_vima);
REGISTER_DECODER(ADPCM_XA, adpcm_xa);
REGISTER_ENCDEC (ADPCM_YAMAHA, adpcm_yamaha);
#if FF_API_VIMA_DECODER
REGISTER_DECODER(VIMA, vima);
#endif
/* subtitles */
REGISTER_ENCDEC (SSA, ssa);

@ -2806,15 +2806,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
},
/* deprecated codec ids */
#if FF_API_VIMA_DECODER
{
.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,
},
#endif
};
const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id)

@ -216,15 +216,3 @@ AVCodec ff_adpcm_vima_decoder = {
.decode = decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
};
#if FF_API_VIMA_DECODER
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 = AV_CODEC_CAP_DR1,
};
#endif

Loading…
Cancel
Save