virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavc: deprecate VIMA decoder

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-02-10 12:13:53 +00:00
parent 9ccc4eedd1
commit ba22295e76
6 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2014-08-09
API changes, most recent first: API changes, most recent first:
2015-02-xx - xxxxxxx - lavc 56.21.102
Deprecate VIMA decoder.
2015-01-27 - 728685f - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h 2015-01-27 - 728685f - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h
Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for
storing the audio service type as side data. storing the audio service type as side data.

2
libavcodec/allcodecs.c
View File

@ -477,7 +477,9 @@ 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); REGISTER_DECODER(VIMA, vima);
#endif
/* subtitles */ /* subtitles */
REGISTER_ENCDEC (SSA, ssa); REGISTER_ENCDEC (SSA, ssa);

2
libavcodec/avcodec.h
View File

@ -390,7 +390,9 @@ enum AVCodecID {
AV_CODEC_ID_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_IMA_APC,
AV_CODEC_ID_ADPCM_VIMA_DEPRECATED, AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'), AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'),
#if FF_API_VIMA_DECODER
AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'), AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
#endif
AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '), AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '),
AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '), AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '), AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '),

2
libavcodec/codec_desc.c
View File

@ -2807,6 +2807,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
AV_CODEC_PROP_LOSSLESS, AV_CODEC_PROP_LOSSLESS,
}, },
#if FF_API_VIMA_DECODER
{ {
.id = AV_CODEC_ID_VIMA, .id = AV_CODEC_ID_VIMA,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
@ -2814,6 +2815,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio (deprecated id)"), .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio (deprecated id)"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
#endif
{ {
.id = AV_CODEC_ID_ADPCM_VIMA_DEPRECATED, .id = AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,

3
libavcodec/version.h
View File

@ -48,6 +48,9 @@
* the public API and may change, break or disappear at any time. * the public API and may change, break or disappear at any time.
*/ */
#ifndef FF_API_VIMA_DECODER
#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_REQUEST_CHANNELS #ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57) #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif

2
libavcodec/vima.c
View File

@ -217,6 +217,7 @@ AVCodec ff_adpcm_vima_decoder = {
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
}; };
#if FF_API_VIMA_DECODER
AVCodec ff_vima_decoder = { AVCodec ff_vima_decoder = {
.name = "vima", .name = "vima",
.long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"),
@ -226,3 +227,4 @@ AVCodec ff_vima_decoder = {
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
}; };
#endif