diff options
| author | James Almer <jamrial@gmail.com> | 2015-09-07 16:04:23 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-09-07 16:06:25 -0300 |
| commit | f9fd879877344aae99a599783e2bc3618e85314b (patch) | |
| tree | 435d8dad74fd0870284bbf1d4a75aa9cfae54a94 | |
| parent | bdbab4a351591304be07586fe55b8b9f01be28e3 (diff) | |
| download | ffmpeg-f9fd879877344aae99a599783e2bc3618e85314b.tar.gz | |
avcodec: remove missing bits from deprecated VIMA decoder
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/allcodecs.c | 3 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 9 | ||||
| -rw-r--r-- | libavcodec/vima.c | 12 |
3 files changed, 0 insertions, 24 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ea1ccf0105..f33e457ce2 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.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); diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 4ba3aa1cea..632748e4c1 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -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) diff --git a/libavcodec/vima.c b/libavcodec/vima.c index 7800c6651b..b4620acf6b 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -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 |