avcodec: deprecate v410 de/encoder

The V30X pixel format was recently added, so this lavc workaround is no longer needed.

James Almer committed 2 years ago

Commit 02306cb1 parent 3c64d618 files · +12 −4Browse files

Unified · Split

8 files

libavcodec/allcodecs.c +1 −1
libavcodec/codec_desc.c +2 −0
libavcodec/codec_id.h +2 −0
libavcodec/v410dec.c +2 −0
libavcodec/v410enc.c +2 −0
libavformat/isom_tags.c +1 −1
libavformat/movenc.c +1 −1
libavformat/riff.c +1 −1

libavcodec/allcodecs.c+1−1

@@ -350,9 +350,9 @@ extern const FFCodec ff_v308_encoder; · 349 unmodified lines
350	350	extern const FFCodec ff_v308_decoder;
351	351	extern const FFCodec ff_v408_encoder;
352	352	extern const FFCodec ff_v408_decoder;
353		−#endif
354	353	extern const FFCodec ff_v410_encoder;
355	354	extern const FFCodec ff_v410_decoder;
	355	+#endif
356	356	extern const FFCodec ff_vb_decoder;
357	357	extern const FFCodec ff_vbn_encoder;
358	358	extern const FFCodec ff_vbn_decoder;

libavcodec/codec_desc.c+2−0

@@ -1146,6 +1146,7 @@ static const AVCodecDescriptor codec_descriptors[] = { · 1145 unmodified lines
1146	1146	.long_name = NULL_IF_CONFIG_SMALL("Dxtory"),
1147	1147	.props = AV_CODEC_PROP_INTRA_ONLY \| AV_CODEC_PROP_LOSSLESS,
1148	1148	},
	1149	+#if FF_API_V408_CODECID
1149	1150	{
1150	1151	.id = AV_CODEC_ID_V410,
1151	1152	.type = AVMEDIA_TYPE_VIDEO,
@@ -1153,6 +1154,7 @@ static const AVCodecDescriptor codec_descriptors[] = { · 1 unmodified line
1153	1154	.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
1154	1155	.props = AV_CODEC_PROP_INTRA_ONLY \| AV_CODEC_PROP_LOSSLESS,
1155	1156	},
	1157	+#endif
1156	1158	{
1157	1159	.id = AV_CODEC_ID_XWD,
1158	1160	.type = AVMEDIA_TYPE_VIDEO,

libavcodec/codec_id.h+2−0

@@ -206,7 +206,9 @@ enum AVCodecID { · 205 unmodified lines
206	206	AV_CODEC_ID_BMV_VIDEO,
207	207	AV_CODEC_ID_VBLE,
208	208	AV_CODEC_ID_DXTORY,
	209	+#if FF_API_V408_CODECID
209	210	AV_CODEC_ID_V410,
	211	+#endif
210	212	AV_CODEC_ID_XWD,
211	213	AV_CODEC_ID_CDXL,
212	214	AV_CODEC_ID_XBM,

libavcodec/v410dec.c+2−0

@@ -46,6 +46,8 @@ static av_cold int v410_decode_init(AVCodecContext *avctx) · 45 unmodified lines
46	46	}
47	47	}
48	48
	49	+ av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n");
	50	+
49	51	return 0;
50	52	}
51	53

libavcodec/v410enc.c+2−0

@@ -37,6 +37,8 @@ static av_cold int v410_encode_init(AVCodecContext *avctx) · 36 unmodified lines
37	37	avctx->bits_per_coded_sample = 32;
38	38	avctx->bit_rate = ff_guess_coded_bitrate(avctx);
39	39
	40	+ av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n");
	41	+
40	42	return 0;
41	43	}
42	44

libavformat/isom_tags.c+1−1

@@ -66,8 +66,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { · 65 unmodified lines
66	66	#if FF_API_V408_CODECID
67	67	{ AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */
68	68	{ AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */
69		−#endif
70	69	{ AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */
	70	+#endif
71	71	{ AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */
72	72	{ AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */
73	73	{ AV_CODEC_ID_TARGA_Y216, MKTAG('Y', '2', '1', '6') },

libavformat/movenc.c+1−1

@@ -2621,8 +2621,8 @@ static int mov_write_video_tag(AVFormatContext s, AVIOContext pb, MOVMuxContex · 2620 unmodified lines
2621	2621	#if FF_API_V408_CODECID
2622	2622	\|\| track->par->codec_id == AV_CODEC_ID_V308
2623	2623	\|\| track->par->codec_id == AV_CODEC_ID_V408
2624		−#endif
2625	2624	\|\| track->par->codec_id == AV_CODEC_ID_V410
	2625	+#endif
2626	2626	\|\| track->par->codec_id == AV_CODEC_ID_V210);
2627	2627
2628	2628	avio_wb32(pb, 0); /* size */

libavformat/riff.c+1−1

@@ -308,8 +308,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { · 307 unmodified lines
308	308	#if FF_API_V408_CODECID
309	309	{ AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') },
310	310	{ AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') },
311		−#endif
312	311	{ AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') },
	312	+#endif
313	313	{ AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') },
314	314	{ AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
315	315	{ AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },