Browse Source

lavc: deprecate VIMA decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n2.6
Paul B Mahol 10 years ago
parent
commit
ba22295e76
6 changed files with 14 additions and 0 deletions
  1. +3
    -0
      doc/APIchanges
  2. +2
    -0
      libavcodec/allcodecs.c
  3. +2
    -0
      libavcodec/avcodec.h
  4. +2
    -0
      libavcodec/codec_desc.c
  5. +3
    -0
      libavcodec/version.h
  6. +2
    -0
      libavcodec/vima.c

+ 3
- 0
doc/APIchanges View File

@@ -15,6 +15,9 @@ libavutil: 2014-08-09

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
Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for
storing the audio service type as side data.


+ 2
- 0
libavcodec/allcodecs.c View File

@@ -477,7 +477,9 @@ 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);


+ 2
- 0
libavcodec/avcodec.h View File

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


+ 2
- 0
libavcodec/codec_desc.c View File

@@ -2807,6 +2807,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
AV_CODEC_PROP_LOSSLESS,
},

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


+ 3
- 0
libavcodec/version.h View File

@@ -48,6 +48,9 @@
* 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
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57)
#endif


+ 2
- 0
libavcodec/vima.c View File

@@ -217,6 +217,7 @@ AVCodec ff_adpcm_vima_decoder = {
.capabilities = CODEC_CAP_DR1,
};

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

Loading…
Cancel
Save