[FFmpeg-devel] [PATCH] fftools/ffmpeg_dec: don't try to copy side data from the decoder if it already exists in the output frame

[James Almer <jamrial@gmail.com>]

We can't use AV_FRAME_SIDE_DATA_FLAG_REPLACE here because the side data already in the
frame should have priority over the global one, so just ensure we don't copy any if
it already exists.

Fixes ticket #11468.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffmpeg_dec.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
index 84ba5c6d5d..898dbb0684 100644
--- a/fftools/ffmpeg_dec.c
+++ b/fftools/ffmpeg_dec.c
@@ -788,10 +788,13 @@ static int packet_decode(DecoderPriv *dp, AVPacket *pkt, AVFrame *frame)
 
         frame->time_base = dec->pkt_timebase;
 
-        ret = clone_side_data(&frame->side_data, &frame->nb_side_data,
-                              dec->decoded_side_data, dec->nb_decoded_side_data, 0);
-        if (ret < 0)
-            return ret;
+        for (int i = 0; i < dec->nb_decoded_side_data; i++) {
+            const AVFrameSideData *src = dec->decoded_side_data[i];
+            if (!av_frame_side_data_get(frame->side_data, frame->nb_side_data, src->type))
+                ret = av_frame_side_data_clone(&frame->side_data, &frame->nb_side_data, src, 0);
+            if (ret < 0)
+                return ret;
+        }
 
         if (dec->codec_type == AVMEDIA_TYPE_AUDIO) {
             dp->dec.samples_decoded += frame->nb_samples;
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".