Message ID | 20240304130657.30631-10-anton@khirnov.net |
---|---|
State | Accepted |
Commit | 01056078ed4d2aef0b880f686d5eb8fce0b823da |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2789086pzb; Mon, 4 Mar 2024 05:08:23 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV75TKVJ54dOyI5Bjs3vn5zkgGAFy34eK6mOh9y7nHDZ7O9s89TXPqUod/bGjH7rkmjpM91JATU+YpD4Iipr6QfrZn5dDaPE3IEoA== X-Google-Smtp-Source: AGHT+IERqSXwQ82FmJxwmssCmueDVuuHKJCzslnsx0wa5GLNgjGQE5tDgqc3whreLffrTJYkuopA X-Received: by 2002:ac2:53ab:0:b0:513:3db6:43f7 with SMTP id j11-20020ac253ab000000b005133db643f7mr3837080lfh.6.1709557703552; Mon, 04 Mar 2024 05:08:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557703; cv=none; d=google.com; s=arc-20160816; b=w5fms8aLfWo1W0muF+7M33z4K+S35IptEi24MP4uNC1vjK5s22a09YZEg1I6nh1D6a pKfTbJU9WYVU6pa5I4vaJ2Db6kUekowOgJy01nsrjaqbs78hq3WLa3/vZFyckk4mljdy Z+MoZllxsyYilY+YEoGogwV0NxGfc5Z096pwyoASheMuFmtEtg0Wb7xM9g3G6O9gdIAX WFSk4dSidSlKYe5VZ5dp+GIRv7ZTEpAsfyaQwBtPSBgbcNGo8prdQjaMasF/OvjEtL2c JabRcQ3+/s0fn7Fq2/Do6SsyT2CK4RK8RhqFJE3ZNdQYBICHrxkvTL+fm3T0VI0FaRJe rXtQ== 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=Be8DyXwAJnc7pqMJduJ6Y4hG33b5lNt70dkxyLeciGQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IBLyWoqywq+ytlEJRF+C5zHx5h/gDSD+0vKVT2yNhZ7Yn/VYacmiaDAec7tEyvTGht ezzSdpHVf1gkU8dOYXxrmNEGj8VxrcJQbAgeT75tXAkZSYX/28M8zo0FFwAc+yRf7FhM zi+yYaN43Xl3/3+bjuyQfGMIcoD9qobJHRyJSEpbckrqLvuF0Sz0VrF55sZWkUi+J+Cy 3XlmwR/6v6NiAqdxx1Wl+XLyySwHcEjJ75HKcPJWkmKk0pNwkmVa0jrpDviQiJWjVxfU kUnlM52kcbJ+z4GPmIjWIbcCLi72NyKNseFHCL22jCuE+R3DGi+4B/uJluK9PiM8DhbF atXQ==; 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="q9sRO/ux"; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a3-20020a1709066d4300b00a3e5ef2d569si3810562ejt.1023.2024.03.04.05.08.23; Mon, 04 Mar 2024 05:08:23 -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="q9sRO/ux"; 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 6953568D455; Mon, 4 Mar 2024 15:07:20 +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 67E8368D407 for <ffmpeg-devel@ffmpeg.org>; Mon, 4 Mar 2024 15:07:14 +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=q9sRO/ux; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 26F914D49 for <ffmpeg-devel@ffmpeg.org>; Mon, 4 Mar 2024 14:07:09 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id OKSUmOYU1Ogj for <ffmpeg-devel@ffmpeg.org>; Mon, 4 Mar 2024 14:07:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=OA70GScSe5y+bL5b3jC0cY03XFwQguTLuQI8kadhCrE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=q9sRO/uxTzDnVUYcwglZsgTfoOOHeNsgz5ePR3+FH+STTGWFYMpfm0L1fwIuG4wRu 2SZ+mFacB30CL3y3yz3oDtOX0QsZruFohxBpQFgYbVhSNhnKIUZXgf3xBB/rw6HOGR kvMfQA1t7nDeCxmCdCdstoVumzISD0qsmOf51jjMwTwQK/hcT+e1/eRaAIVghiKCvK Lt5E/5STTOcQG9Lkq0VnoFdxhalgVGitm8q1hhqcLU7rmud5zR882nG3+losp9R+ab hTQExm/jwYV9DC/4RN7p5UOzB1X5olM6098qYuCWpcah6CiUte8WOgnlsr4r0rqizn Tynbtp3SEhxVg== 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 6EE464D56 for <ffmpeg-devel@ffmpeg.org>; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 51C7E3A0F55 for <ffmpeg-devel@ffmpeg.org>; Mon, 4 Mar 2024 14:07:00 +0100 (CET) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:25 +0100 Message-ID: <20240304130657.30631-10-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/29] 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: 7A7QnnSUuANq |
Series |
[FFmpeg-devel,01/29] lavu/opt: factor per-type dispatch out of av_opt_get()
|
expand
|
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 704b9d6298..af80ee0b17 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -954,8 +954,9 @@ 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)) - av_buffer_unref(&buf); + ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &buf, NULL); + if (ret < 0) + return ret; avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; break;
From: Niklas Haas <git@haasn.dev> --- libavcodec/av1dec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)