From patchwork Fri Mar 1 12:37:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp1235404pzb; Fri, 1 Mar 2024 04:39:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWCToy8kFySmwefdSoQMlC8hq6YspJ/EMIKrMgNtcKMUCc/tH27aboKzafHTq1wxJetaTFB9EKdLsT2ighu/Z91eFPmVc+s4uYAVw== X-Google-Smtp-Source: AGHT+IGSJGjVqETl379ga0pKKusLRfARpuGRQOBUTKfYneFB6yCViqjA6/qI3SudkYEQe6oal76i X-Received: by 2002:a17:906:3b0b:b0:a44:b965:63e7 with SMTP id g11-20020a1709063b0b00b00a44b96563e7mr44162ejf.2.1709296778295; Fri, 01 Mar 2024 04:39:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709296778; cv=none; d=google.com; s=arc-20160816; b=LQQXOrbUSI6R973VQMMVKTt/Fs0MvDiMPKBtFTYoM2YZzHfOY6X8QFugLplSnzJjba 6C8KlxBrD/FyEMJLXe+CSZZVt7Iem9TRgxiviBbl/Uj6kUSu4UaqmulSyJCafNbyovU7 cItswtYanpXwvE6SC6/PqL/DjpdjZ3egtQ2Vll3hiCqzve8ISJesbFveP0LGVH3DT4SJ EhKAv245M5C+42DRLMWL1X9w+zys/khs4e38x8c/O9/vcVOsFO1i/kHWKQyvk6yHUlvk gZvS0ED/uxpFrSHelaw6rrJFa46ghG0pPmaak1XIEl54gsJyDA6pIhuPoR1mt48tG4yq y8sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=5x7EFKRc+fUrbfm93uCrZ5ZPwYhugG6YSEHJ7v3xXTU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=0ILxx1DbNVq4P3fuBoTUa2gTfrYxJ5KAikEteAXcee+5Gw1pDOrfIjtrSXP1kzVnD8 jOf2ZgPYGKxmxgDy30TUJgBMvJSuDLYxN5JVQRo07Lfu/umK4YIpzz4+oFZGOv1Zj993 nvq9rJqcLn16bx/g8aJeoaKcEixd1+BDJDEddCbuZO/InQMNVwRRiUJBmg7NkuapyQm6 z7TXEqVoBOFssMPzDC8cZF6VzbhJNztQN4CinhfqCoWvlDgXv3SXfvJJVSFrZ7Eyq1GE 1tstIu0HSSwwgtgJ0IxRhd2SZvmwEnLUnLPQcNOIo+7JEMbc4Yt+vxSXdbjzcqS2JNkk 0zhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=lPUECNB4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw9-20020a1709066a0900b00a42f6cb6bafsi1498096ejc.294.2024.03.01.04.39.37; Fri, 01 Mar 2024 04:39:38 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=lPUECNB4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB2AF68D245; Fri, 1 Mar 2024 14:39:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QnLayWRwIQBK 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);