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 ESMTP id 13F9648F66 for ; Fri, 1 Mar 2024 12:39:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2F6968D1CE; Fri, 1 Mar 2024 14:39:33 +0200 (EET) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DA0768D128 for ; Fri, 1 Mar 2024 14:39:26 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5ce07cf1e5dso1849690a12.2 for ; Fri, 01 Mar 2024 04:39:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709296763; x=1709901563; 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=N/Z1OgQSy/P6bopmjthEcpPlJjmU1mu6TFzwuI1AmvA=; b=lPUECNB4WC1OXQ0rli7zim02FmwLci7TRJFatqTYwG+RB1EAiBWU5hQVES7E3gBKF7 SIvFFSwlL2dIWtdhoGj5iu2L/k2vaNLQsVpWRyN3gK3VAgcqIjJfXvmkHhZfMxp3q+pK i8UMlKuUjB2ckTvEoEv/EfaTwZktg5apLFE3PsR9CZAAl4EfxKOVGijb6P0LhjGo6wX/ FmUW5n+SCJ8j1S4Zxsrd1hQqmttKVeBBtqZvFyI+kjJ+KlyWDi60k2IRc5OBFrJXvmpD kIt+YyAIro9YQj6F0m1ISK/ThZX+GgJfuMgqk/B8x4/cP3F5Aj/gxKWPezlBn6ACb8aM 5wCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709296763; x=1709901563; 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=N/Z1OgQSy/P6bopmjthEcpPlJjmU1mu6TFzwuI1AmvA=; b=AB0Ubvgyo+eggZGFigemc2B9gJNwF1Fy3SJOuvkBG5l4xFkb+sVZD9UILp4pwLrl8T FTs1dNDuzXuRB3n8mTY87KwCDkysX3dJanZS26oLZUZJLWN4cWj2WXnK1O8lD6crmei2 dzfehtHNCH9o2WRET5sYptC/ekapo3Jn52jl+QdK85P3exsdUu7YynLRpg+evGJH/mCp Wh/uORXvEM8Mx1TV2igmr71FErGxqKaWUNGj2tgOAi4Z7sEWLjp2dyBDZ6JKrhnvF182 WhFDZLGyxMSESG765mJuUxpP7v3ytw3YDo/Ew4YxVkhttP+ujlwITItCLo+YOurObbtI JvSQ== X-Gm-Message-State: AOJu0YwMxW+SFU6Eqs75G0fxJlEvK3arfS/a1hj7cNlmjzUiUJq4KS+Z KBzRq9rEGGioQXsMcviNc3Zzi6mr28zU9sX52c+LQacX/R/JblRRmYz5Rjsp X-Google-Smtp-Source: AGHT+IG06j5ajYn6YFHgdhtIUlfHdkF4Ucx1/ijLnQ+P1uIJ+0HTsh0bnE0cZpjYwCf2CX1il4raZw== X-Received: by 2002:a05:6a20:92a4:b0:1a1:31a0:f07a with SMTP id q36-20020a056a2092a400b001a131a0f07amr1015660pzg.60.1709296763352; Fri, 01 Mar 2024 04:39:23 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k1-20020a17090a4c8100b0029b173f9c21sm2454012pjh.43.2024.03.01.04.39.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 04:39:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Mar 2024 09:37:43 -0300 Message-ID: <20240301123743.2332-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: give packet side data priority over global 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: Restores the behavior prior to ae22271620df90567ba276832b33607d64e9ba9c, where global side data would be inserted first to the output frame, resulting in both two entries for the same type and having priority when fetched by the AVFrame helpers. This is a temporary fix for ticket #10857 until a proper method to select the source for side data is implemented. Signed-off-by: James Almer --- This is meant to restore the old behavior in git master until https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10880 is finally implemented. libavcodec/decode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 7c67b18bc4..0dbbf4a6da 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1465,6 +1465,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (packet_sd) { AVFrameSideData *frame_sd; + av_frame_remove_side_data(frame, sd_global_map[i].frame); frame_sd = av_frame_new_side_data(frame, sd_global_map[i].frame, size); if (!frame_sd) return AVERROR(ENOMEM); -- 2.44.0 _______________________________________________ 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".