lavc: deprecate VIMA decoder

Paul B Mahol committed 11 years ago

Commit ba222951 parent 9ccc4ee6 files · +14 −0Browse files

Unified · Split

6 files

doc/APIchanges +3 −0
libavcodec/allcodecs.c +2 −0
libavcodec/avcodec.h +2 −0
libavcodec/codec_desc.c +2 −0
libavcodec/version.h +3 −0
libavcodec/vima.c +2 −0

doc/APIchanges+3−0

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

libavcodec/allcodecs.c+2−0

@@ -477,7 +477,9 @@ void avcodec_register_all(void) · 476 unmodified lines
477	477	REGISTER_DECODER(ADPCM_VIMA, adpcm_vima);
478	478	REGISTER_DECODER(ADPCM_XA, adpcm_xa);
479	479	REGISTER_ENCDEC (ADPCM_YAMAHA, adpcm_yamaha);
	480	+#if FF_API_VIMA_DECODER
480	481	REGISTER_DECODER(VIMA, vima);
	482	+#endif
481	483
482	484	/* subtitles */
483	485	REGISTER_ENCDEC (SSA, ssa);

libavcodec/avcodec.h+2−0

@@ -390,7 +390,9 @@ enum AVCodecID { · 389 unmodified lines
390	390	AV_CODEC_ID_ADPCM_IMA_APC,
391	391	AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
392	392	AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'),
	393	+#if FF_API_VIMA_DECODER
393	394	AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
	395	+#endif
394	396	AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '),
395	397	AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
396	398	AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '),

libavcodec/codec_desc.c+2−0

@@ -2807,6 +2807,7 @@ static const AVCodecDescriptor codec_descriptors[] = { · 2806 unmodified lines
2807	2807	AV_CODEC_PROP_LOSSLESS,
2808	2808	},
2809	2809
	2810	+#if FF_API_VIMA_DECODER
2810	2811	{
2811	2812	.id = AV_CODEC_ID_VIMA,
2812	2813	.type = AVMEDIA_TYPE_AUDIO,
@@ -2814,6 +2815,7 @@ static const AVCodecDescriptor codec_descriptors[] = { · 1 unmodified line
2814	2815	.long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio (deprecated id)"),
2815	2816	.props = AV_CODEC_PROP_LOSSY,
2816	2817	},
	2818	+#endif
2817	2819	{
2818	2820	.id = AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
2819	2821	.type = AVMEDIA_TYPE_AUDIO,

libavcodec/version.h+3−0

@@ -48,6 +48,9 @@ · 47 unmodified lines
48	48	* the public API and may change, break or disappear at any time.
49	49	*/
50	50
	51	+#ifndef FF_API_VIMA_DECODER
	52	+#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 57)
	53	+#endif
51	54	#ifndef FF_API_REQUEST_CHANNELS
52	55	#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57)
53	56	#endif

libavcodec/vima.c+2−0

@@ -217,6 +217,7 @@ AVCodec ff_adpcm_vima_decoder = { · 216 unmodified lines
217	217	.capabilities = CODEC_CAP_DR1,
218	218	};
219	219
	220	+#if FF_API_VIMA_DECODER
220	221	AVCodec ff_vima_decoder = {
221	222	.name = "vima",
222	223	.long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"),
@@ -226,3 +227,4 @@ AVCodec ff_vima_decoder = { · 3 unmodified lines
226	227	.decode = decode_frame,
227	228	.capabilities = CODEC_CAP_DR1,
228	229	};
	230	+#endif