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

 extern const FFCodec ff_v308_decoder;
 extern const FFCodec ff_v408_encoder;
 extern const FFCodec ff_v408_decoder;
-#endif
 extern const FFCodec ff_v410_encoder;
 extern const FFCodec ff_v410_decoder;
+#endif
 extern const FFCodec ff_vb_decoder;
 extern const FFCodec ff_vbn_encoder;
 extern const FFCodec ff_vbn_decoder;

         .long_name = NULL_IF_CONFIG_SMALL("Dxtory"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
     },
+#if FF_API_V408_CODECID
     {
         .id        = AV_CODEC_ID_V410,
         .type      = AVMEDIA_TYPE_VIDEO,
         .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
     },
+#endif
     {
         .id        = AV_CODEC_ID_XWD,
         .type      = AVMEDIA_TYPE_VIDEO,

     AV_CODEC_ID_BMV_VIDEO,
     AV_CODEC_ID_VBLE,
     AV_CODEC_ID_DXTORY,
+#if FF_API_V408_CODECID
     AV_CODEC_ID_V410,
+#endif
     AV_CODEC_ID_XWD,
     AV_CODEC_ID_CDXL,
     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	return 0;	51	return 0;
50	}	52	}
51		53

@@ -37,6 +37,8 @@ static av_cold int v410_encode_init(AVCodecContext *avctx) · 36 unmodified lines
37	avctx->bits_per_coded_sample = 32;	37	avctx->bits_per_coded_sample = 32;
38	avctx->bit_rate = ff_guess_coded_bitrate(avctx);	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	return 0;	42	return 0;
41	}	43	}
42		44

Keyboard shortcuts