From patchwork Fri Feb 23 13:58:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46488 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp994824pze; Fri, 23 Feb 2024 06:36:13 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWUgJJIUL8hhyDrC9JFpl9Y/AjETEcnfzBiSupkCbEPfJ3wQHb+4UnJUbDn8B/AOyZhOfvuNJWFnN0t/SKqEp2x2ZvSROzMNNxhbg== X-Google-Smtp-Source: AGHT+IHQhXXPdzl9tgLP1G0FqUrKWRPaDzFqcQkTNputNjGh55UnM1sUm87lsJ9dAXZyS+fSxR2D X-Received: by 2002:a17:906:5648:b0:a3e:6862:dc81 with SMTP id v8-20020a170906564800b00a3e6862dc81mr1443933ejr.64.1708698973232; Fri, 23 Feb 2024 06:36:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708698973; cv=none; d=google.com; s=arc-20160816; b=T5sjmpPgBncBZ6Dz/2C9cBSBGW9MoV+Q/1N399R8l9afgj+Nc+8Gwj1aVTGQVDD1YA XRxQzxVViZqldfmWIb7UlaAjL9IBegfZsx8nYsGe8uVTfHiRNcCdPx9DrFV5tH9y+EYU 5pzj5b6M35bryBRS1OuY3UwJJ31H9XKSklg9uuBy1dt2CQoJAkBCU5EogoxEonse5dad HSzhjfAPpBx7BhB+HXic4LGe25XpjrQ3KMLHbmc6Sqhbk5zfTKt9D9wWsVzHRGqY9Sxd cAWebxJoBsNuWQmKDQqsNq8WDWPqW/nczDmvMbQNYBbMq/A9vYqZCTilz1Ex4exu8jt7 Ms4w== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=x4LnVxls/JPSlpcZcX1whWv8bh0PlqChhS0YNSpuSSo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JFQQuZXtlCmXIrtrdGbUm+MJPrKwOLGMbwAkKcIF6fMdjtvtOW1nN+A74rbXuJGK75 wh0Y6bLJ1svVaJjtv+ReliJT6DFsqJbaYuZsJomFClwRdzPk0AsCihWWl/XGufhN3I/M W03m1UEW/ln7MREPGYT9wkZBpdXJl6CAylREk4eZbjMZE6uGKkLcPrZ6KZBfDBe2BGPw SZQrj/SFne3w7Q8044CvJc7phvYTIP4qUtVz7GxfPmlnlDg4UTk62RY9XYfwp+AO0/d3 0f3Lr5oe/hXqmk04fl74r41yy0nAu+inLyzESc2DdKBBZSX1GfEKaWq0USce/Q3hMK7g QGOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=cwuYm134; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq19-20020a1709073f1300b00a3ebe808ffasi4546813ejc.190.2024.02.23.06.36.12; Fri, 23 Feb 2024 06:36:13 -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=@khirnov.net header.s=mail header.b=cwuYm134; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E26368CC28; Fri, 23 Feb 2024 16:32:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5827068C6F8 for ; Fri, 23 Feb 2024 16:31:36 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=cwuYm134; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3CD644CFF for ; Fri, 23 Feb 2024 15:31:36 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id nio9K-7oV10s for ; Fri, 23 Feb 2024 15:31:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698689; bh=Eg4B6bdVatl0Sp8oIof69wnaskdRXoC1ty7PyyTqZag=; h=From:To:Subject:Date:In-Reply-To:References:From; b=cwuYm134Gez+afNvRLVMiMfjzDhyUPcfrbIT9te+MVu6hpK+Wq/UnePCN1au3YZjx p00Q3y5tdJD8aI5xBiD+hrMfGsrroEJ9u5rDfJNZ0uyWz803oCZwEcwFm6MYw8WcuJ 7Gkh0ujJ2pnFVSwJGl7zOQzqAvgQczuSB2FvIkiPhMGFE3j3o/RmFEc5Nldi9AKhHA zs25lnEJ0NrliagoYJ6vfDF6R+bU/vtsVUbuFsPqOiCGRwKTY+DJA6i/AZuMxWGhO3 h32Q3Ii7ecV1veuRQgkUdjO0hST5asAKZ+IllXJ+47f3CXzhE0fededEQGd4G0aWz8 jp6kYTQuX7npw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id CC9A24D54 for ; Fri, 23 Feb 2024 15:31:27 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B04BC3A1E81 for ; Fri, 23 Feb 2024 15:31:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:41 +0100 Message-ID: <20240223143115.16521-20-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/38] avcodec/av1dec: respect side data preference 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: xMqTEnVoSs21 From: Niklas Haas --- libavcodec/av1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 7debc4deda..4fcfed3c7b 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -946,7 +946,7 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame *frame, if (!ret) break; - if (!av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_A53_CC, buf)) + if (!ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, buf)) av_buffer_unref(&buf); avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;