virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec: remove missing bits from deprecated VIMA decoder

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-09-07 16:04:23 -03:00
parent bdbab4a351
commit f9fd879877
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/allcodecs.c
View File

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

9
libavcodec/codec_desc.c
View File

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

12
libavcodec/vima.c
View File

@ -216,15 +216,3 @@ AVCodec ff_adpcm_vima_decoder = {
.decode = decode_frame, .decode = decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .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