From c83c2734006272347d03d6cd04d91e5c6d5c511a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Wed, 8 May 2024 03:20:45 +0200
Subject: [PATCH] demux_mkv: inject AV_PKT_DATA_DOVI_CONF to demuxed packets

---
 demux/demux_mkv.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 0db7cb1ca2..8d8a5d66de 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2986,6 +2986,18 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info)
                         add->block_additional.start, add->block_additional.len);
                 }
             }
+            if (track->dovi_config) {
+                size_t dovi_size;
+                AVDOVIDecoderConfigurationRecord *dovi = av_dovi_alloc(&dovi_size);
+                MP_HANDLE_OOM(dovi);
+                memcpy(dovi, track->dovi_config, dovi_size);
+                if (av_packet_add_side_data(dp->avpacket,
+                                            AV_PKT_DATA_DOVI_CONF,
+                                            (uint8_t *)dovi, dovi_size) < 0)
+                {
+                    av_free(dovi);
+                }
+            }
 
             mkv_parse_and_add_packet(demuxer, track, dp);
             talloc_free_children(track->parser_tmp);