From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 28F7C4D785 for ; Mon, 24 Feb 2025 03:03:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D38468CC60; Mon, 24 Feb 2025 05:03:14 +0200 (EET) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 151DD68C918 for ; Mon, 24 Feb 2025 05:03:08 +0200 (EET) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2f9d3d0f55dso5889498a91.1 for ; Sun, 23 Feb 2025 19:03:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740366186; x=1740970986; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0CBZMK+Fmkfj6jPqg0xX+F1NOfj7V3WgwOcJhkhq1DE=; b=IHjB0/h+6uvR9xkBagaq/7aKtyjQA4ltwlq4fLEQxz+UsUy0qnqHu8ALs/mdNFtDED XwtPxsQ//cE0AhBfvRov7++ThjKo0keQ7GeT8q0EsArH5sdPGSgTHqsbFEj8CT7SGEw7 uzVE8wcDvaNprN8NChJyxmR6PsmaYKCWuZP2M7gllq0UouNeqNA4NSMus+PO6tNBrQcm dNBZ0UyycldZUE6GtHghb5Qusv3Vi4nUkn6EYFn7FkqUvJS8P3xUGN1YgyJY5HovViLH Z665R74IeGtyEQxuK9ZUl5elhSPmMMXltxnjougYWZ/mcFt2rX9iwv+w0HXqZisCvgON q56A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740366186; x=1740970986; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0CBZMK+Fmkfj6jPqg0xX+F1NOfj7V3WgwOcJhkhq1DE=; b=SHKjCcuz/Twr0tI7p3GQed6p2SN0kN0hjjY7HrElIxKmTa14ZrGZmoQbVn7dPUmebt 6NkVgQrEa4dAefy05xqqH0XA0M253b9Ls0EtBt3Hm+b0nBHWhIBp1MW40dNzH+yhnvD6 ylmbUuJZkU6n7YGQpQjeTVM+ba5G5rvjc0R98n0tQlO4962KS8Dz7qvTPSPfhU9srE5X MNZW/KZtDt8NByxFnyxew5eyzbEkKQj/Y2RG4goMs5gi3ajWIkMLZFiXy05fY7JidoCF RsWTNI4SY5fd4AJYH7m9KhypVZFfRfkMwSiazvsB7P3oI2TeHstILcYhx6+q+ii4tkIl 9Dpg== X-Gm-Message-State: AOJu0YxxY6OuuniDOhQSgNMJp6JKEicOLYAqVJ6YrCj0xv+eIXhq8GW8 pUhyDb75VxT6yfO83YUi1idxrqPrsABKhF7YRiw/ByiRw4T1Otj0cTYCqsrk X-Gm-Gg: ASbGncts+Gth4Un94rdjY8FXeIHH9wfPZeJDDoWpH8wFtZXSs4CEMOboU5OwN9Wh8Ce NT2EiWMuRf/7eJJVpAxu7RF8mEurqjHaJLgrSZc6PabiuzC+oyok/a6Cg/iHodfSDYpIHj6vcQW ylnEgaPusC86Ft5CUvpj52K9xoeyH0puTG2hzXeS/AeY/c4ZGL/kHYXBlNPTyd+OI05oMPp4tiN NOVjDNzBbG53eB45+hI+flQKtq4AUq/6YmQyqyXsodqQIb6J8g0+qBvFFddR4NUq+xShdNDntMu eP5aD/HUhYnKYPGYBfE2AXVZ6ulEuVKOphY8EsUDaGk= X-Google-Smtp-Source: AGHT+IHk510K0uvqKHbN+zKUm8TLjWs/1JhnPr7PjKHQfm1DxQYhWAqUbgOsZzdjq03g7pxRP0wCNQ== X-Received: by 2002:a17:90b:37c7:b0:2ee:5691:774e with SMTP id 98e67ed59e1d1-2fce77a6268mr20780220a91.2.1740366185712; Sun, 23 Feb 2025 19:03:05 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:b49d:85a5:a7d1:4da6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fceb0707fdsm5263652a91.30.2025.02.23.19.03.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 19:03:05 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Feb 2025 00:02:50 -0300 Message-ID: <20250224030250.21221-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_dec: don't try to copy side data from the decoder if it already exists in the output frame X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 --- 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".