From patchwork Mon Aug 2 13:10:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1557558ioh; Mon, 2 Aug 2021 06:10:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxU9jh1uWHcpWPEwDrPlorCxAOTzIUpW6K513ZBOzM4skHRkiJfGcrCihVUfqnZs1otJi9C X-Received: by 2002:a2e:7404:: with SMTP id p4mr10866871ljc.163.1627909846949; Mon, 02 Aug 2021 06:10:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627909846; cv=none; d=google.com; s=arc-20160816; b=NIu04J0/KiONP9msA/U9CbYy9RixVU8SmMGtnp9A/VVkqYFC2q1jQ171cxhwBye8JQ mwxNP728fE0mHDGyLboUx86LLtFhVyGUf/djg9REWz1jkcsCyPFiv8zk4iDsUIonNPxL XBFZHuk0ZtFCcl/MVLq+TzlVKnjUkqrDWBz5G316OjUMmg4Lz5IiXhjRv8q3eLtuLQDX iyPTJkDpwjRi3by7caYwKAmFJvFBbRAMaLAmw0sDbScj2KEq75FPn4+Q48zVgXw8k7DY jzFxDNMk3KizEXmsn/NL73tZRq97CP1h9hH20HlfzBbBavv4geTw8JzTd0txJ/D/jlP1 ihyg== 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=GBnjPnKCJ4ks38Bo10o5mx2m5AC/frLM232aB0BjHqg=; b=ydt4Prves/nxYAj/fINDV3od2MQ3Qxj38U/sLayL8Y4/wowPEpFqOz51dyvzCCVRPY kWSrotgPhxV23qTHY2ngEFOjOLm2qnypW3HdHAmSTbObiwU2pq4iridbUtGV6haS9Z1T Gpjl8XhaES1F+GbWyMeMCe4MEjgKytKNHONYH4zfcXUqEJX0u4yV2tFWDMreRQCSBvH6 XHEJ6cK+Bl15Ad5ON67a9t+BBT0gr+wRrW6A1A0KLNjPa1oDE4B7PPJP9YhvbRFcmPCO DzH5ezjPdG6JrZi0LNk8jDxKP8I/jvGRFm2JM2Afo5ubaumj+byxjLEK1QUfoQAzPF3R yM3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PN2jm+hY; 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 k9si9805867edq.139.2021.08.02.06.10.46; Mon, 02 Aug 2021 06:10:46 -0700 (PDT) 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=20161025 header.b=PN2jm+hY; 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 4C9BA689ADA; Mon, 2 Aug 2021 16:10:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C17E56899DA for ; Mon, 2 Aug 2021 16:10:36 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id mz5-20020a17090b3785b0290176ecf64922so31605061pjb.3 for ; Mon, 02 Aug 2021 06:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=K4GS5ee1KD+ZQtA2te4vKqPJv7qXpMQm2FVi6uYxGe4=; b=PN2jm+hYqiOSJJk9SxGaYJAjYZk0RsoTvh+srkNzrgRH2j/iNFgSWHTBArK7DeyIqx aoi+s+7y8Xp90ReZu62q4VA9wEs86t+2WZAa4tetvQpDW3avq6n9iu42rbtqKr33x8qE BhmhGQOBGsND6FbTRaEy8YCxJ+MeVcmYPoH1X/FVlW6T/k8aYcVwwTqtJrAPzsb8hx+f /djMWG1HXigS2LDGaz1ZIkC6J8CYg2Pg3z4yVTKr8qdfUQn7fNHnzVzxpGqYinjaP3tv evEHgniJOIh1Ob4V+XX3sf0HGSAGwRtUCdAQlk7GqJRyl2fGCgwZygtDs8o3nUoIwBGe 4U0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=K4GS5ee1KD+ZQtA2te4vKqPJv7qXpMQm2FVi6uYxGe4=; b=P+YbzOI5d/bKWh9veU7/f7udvOQjAAWYS/PDDFKiR1XGhtyqvPPrhMVBOVIsSVvu2k fk82sDUmXZZdT7gd4X0xY4OzBIOp00sQCkwI9DlcxYANg/MbD/+0xWuXd2K0b7ECZ+ms uTUJS3gYk5Z7Ojqd0vT5g3Aqs0l2gbYgST2c4lVpRvbnwkk8Rkvo5Y5K/cpFawhWYVLg HPKsZmFxcMo8IUFGaXchBgq+Na+xhe2fXTw4HYrMJ0aQyYzDp2fL3ibHFQAExCtMkeUh WQPeujrRck7jbLTCsR5dPTWRrNtdl7jcfq0Bl6GnVJYXTQR96uFBZtOKBDvMlvYpvRfk gU/Q== X-Gm-Message-State: AOAM531eVZoFIumiI+jkE9+fuZ8Qs+eTxeATNlGMqVZh+1sOGxc6I+Kv i4FKzMfeKChezWmfBt/TRuzOJhGF+FnNAg== X-Received: by 2002:a62:dd83:0:b029:30f:d69:895f with SMTP id w125-20020a62dd830000b029030f0d69895fmr16595308pff.17.1627909834838; Mon, 02 Aug 2021 06:10:34 -0700 (PDT) Received: from localhost.localdomain ([191.84.227.130]) by smtp.gmail.com with ESMTPSA id b12sm8020808pff.63.2021.08.02.06.10.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 06:10:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 10:10:18 -0300 Message-Id: <20210802131018.338-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/avfilter: use av_frame_copy() to copy frame data 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: LtMOIIY+TY1K Signed-off-by: James Almer --- libavfilter/avfilter.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c04afc6639..1f33702482 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1446,19 +1446,10 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) return ret; } - switch (link->type) { - case AVMEDIA_TYPE_VIDEO: - av_image_copy(out->data, out->linesize, (const uint8_t **)frame->data, frame->linesize, - frame->format, frame->width, frame->height); - break; - case AVMEDIA_TYPE_AUDIO: - av_samples_copy(out->extended_data, frame->extended_data, - 0, 0, frame->nb_samples, - frame->channels, - frame->format); - break; - default: - av_assert0(!"reached"); + ret = av_frame_copy(out, frame); + if (ret < 0) { + av_frame_free(&out); + return ret; } av_frame_free(&frame);