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

Showing the changes to libavcodec (5 of 8 files). Show all

Unified · Split

5 files

@@ -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;

@@ -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,

@@ -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,

@@ -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

@@ -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

Keyboard shortcuts