avcodec/decode: remove HDR10+ from the global side data array

It's a per packet/frame side data type.

James Almer committed 2 years ago

Commit d65908c1 parent d34e9a81 file · +1 −1Browse files

Unified · Split

libavcodec/decode.c+1−1

@@ -1433,7 +1433,6 @@ static const struct { · 1432 unmodified lines
1433	1433	{ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA },
1434	1434	{ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL },
1435	1435	{ AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE },
1436		− { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS },
1437	1436	{ AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT },
1438	1437	};
1439	1438
@@ -1446,6 +1445,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, · 6 unmodified lines
1446	1445	} sd[] = {
1447	1446	{ AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC },
1448	1447	{ AV_PKT_DATA_AFD, AV_FRAME_DATA_AFD },
	1448	+ { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS },
1449	1449	{ AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE },
1450	1450	{ AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES },
1451	1451	};