diff mbox series

[FFmpeg-devel] avcodec/decode: remove HDR10+ from the global side data array

Message ID 20240305144632.58731-1-jamrial@gmail.com
State Accepted
Commit d65908c3d416e331e075c3a5ffe7bc670112a018
Headers show
Series [FFmpeg-devel] avcodec/decode: remove HDR10+ from the global side data array | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer March 5, 2024, 2:46 p.m. UTC 
It's a per packet/frame side data type.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/decode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Derek Buitenhuis March 5, 2024, 11:25 p.m. UTC | #1 
On 3/5/2024 2:46 PM, James Almer wrote:
> It's a per packet/frame side data type.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/decode.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

LGTM

- Derek
James Almer March 6, 2024, 12:42 a.m. UTC | #2 
On 3/5/2024 8:25 PM, Derek Buitenhuis wrote:
> On 3/5/2024 2:46 PM, James Almer wrote:
>> It's a per packet/frame side data type.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   libavcodec/decode.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> LGTM
> 
> - Derek

Applied, thanks.
diff mbox series

Patch

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 7c67b18bc4..cd483528c5 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -1433,7 +1433,6 @@  static const struct {
     { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA },
     { AV_PKT_DATA_CONTENT_LIGHT_LEVEL,        AV_FRAME_DATA_CONTENT_LIGHT_LEVEL },
     { AV_PKT_DATA_ICC_PROFILE,                AV_FRAME_DATA_ICC_PROFILE },
-    { AV_PKT_DATA_DYNAMIC_HDR10_PLUS,         AV_FRAME_DATA_DYNAMIC_HDR_PLUS },
     { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT },
 };
 
@@ -1446,6 +1445,7 @@  int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx,
     } sd[] = {
         { AV_PKT_DATA_A53_CC,                     AV_FRAME_DATA_A53_CC },
         { AV_PKT_DATA_AFD,                        AV_FRAME_DATA_AFD },
+        { AV_PKT_DATA_DYNAMIC_HDR10_PLUS,         AV_FRAME_DATA_DYNAMIC_HDR_PLUS },
         { AV_PKT_DATA_S12M_TIMECODE,              AV_FRAME_DATA_S12M_TIMECODE },
         { AV_PKT_DATA_SKIP_SAMPLES,               AV_FRAME_DATA_SKIP_SAMPLES },
     };