mirror of
https://github.com/librempeg/librempeg
synced 2024-11-22 00:51:37 +00:00
avcodec: deprecate v410 de/encoder
The V30X pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
db6f01f3c5
commit
4d8465821b
@ -353,9 +353,9 @@ extern const FFCodec ff_v308_encoder;
|
||||
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;
|
||||
|
@ -1146,6 +1146,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.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,
|
||||
@ -1153,6 +1154,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.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,
|
||||
|
@ -206,7 +206,9 @@ enum AVCodecID {
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -37,6 +37,8 @@ static av_cold int v410_encode_init(AVCodecContext *avctx)
|
||||
avctx->bits_per_coded_sample = 32;
|
||||
avctx->bit_rate = ff_guess_coded_bitrate(avctx);
|
||||
|
||||
av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -66,8 +66,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
|
||||
#if FF_API_V408_CODECID
|
||||
{ AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */
|
||||
{ AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */
|
||||
#endif
|
||||
{ AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */
|
||||
#endif
|
||||
{ AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */
|
||||
{ AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */
|
||||
{ AV_CODEC_ID_TARGA_Y216, MKTAG('Y', '2', '1', '6') },
|
||||
|
@ -2620,8 +2620,8 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex
|
||||
#if FF_API_V408_CODECID
|
||||
|| track->par->codec_id == AV_CODEC_ID_V308
|
||||
|| track->par->codec_id == AV_CODEC_ID_V408
|
||||
#endif
|
||||
|| track->par->codec_id == AV_CODEC_ID_V410
|
||||
#endif
|
||||
|| track->par->codec_id == AV_CODEC_ID_V210);
|
||||
|
||||
avio_wb32(pb, 0); /* size */
|
||||
|
@ -308,8 +308,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
|
||||
#if FF_API_V408_CODECID
|
||||
{ AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') },
|
||||
{ AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') },
|
||||
#endif
|
||||
{ AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') },
|
||||
#endif
|
||||
{ AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') },
|
||||
{ AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
|
||||
{ AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
|
||||
|
Loading…
Reference in New Issue
Block a user