ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Sep 7 16:04:23 2015 -0300| [f9fd879877344aae99a599783e2bc3618e85314b] | committer: James Almer
avcodec: remove missing bits from deprecated VIMA decoder Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9fd879877344aae99a599783e2bc3618e85314b --- libavcodec/allcodecs.c | 3 --- libavcodec/codec_desc.c | 9 --------- libavcodec/vima.c | 12 ------------ 3 files changed, 24 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ea1ccf0..f33e457 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 4ba3aa1..632748e 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 7800c66..b4620ac 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog