From patchwork Mon Feb 26 14:21:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanna Ciebiera X-Patchwork-Id: 46541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1397149pzb; Mon, 26 Feb 2024 06:23:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWPriRhSZmAFXYbeB8R+roxA/syLGWpjavM8j2YP2+Le0xRvvg37WURlxA5VMguL2obhnFWrild17+26tIW2JsVZcriuG36LxC2gg== X-Google-Smtp-Source: AGHT+IFO1/wUiCP0rqAm4aWkYy5PqrbU2BhIaFL9ojI4cyGB5TXgZ6tvJjWPYYKLtaX2GyPYIH0D X-Received: by 2002:a17:906:7c55:b0:a3e:6501:339d with SMTP id g21-20020a1709067c5500b00a3e6501339dmr4967363ejp.61.1708957423118; Mon, 26 Feb 2024 06:23:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708957423; cv=none; d=google.com; s=arc-20160816; b=vDW0SR+z1CZ9cs+IcbhbbUwfvN4jnFvoc7rKqHjHm+NPFesfMzsL0Mvjv4ItTuCM/n NAGF0SV7/JWTr9rtnOKzEgsb+4nT0QEia+b5kMHwiAour2t7HtXnPFUp2/kBJnGfbyfW Tz3rDf3AYbbTzbaHZHcq9mrGkracMMqf0Y9HoBaXFmQXo7oXnEyRaP+H14W+goXrHH3C 04ViCgSj2BVbOg/XxKXa/UyJjSdPoRe6ZWqiGMqMutdwlcQUmiM+Atl55VkOTsgDWXHr eB9Og+g8gFnEEv50h/vXbuxbfcqgXjnkw5cjJ3UG/uhSM7UHtuqOTiNoKfhECyX/hDpu 4xgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=cdGZOY5s22NOF4cGBc+oFE+Iws94ZGiQI5gavS+sKio=; fh=RjoB+covCaWFI3b1xnm8oR5/0kyMaxinjtTyW7zDh7Y=; b=JqN8m/TvSxl0E8ZoOqeJRp4FYr7mtnPdtBCmOEwVprRxoQbGZVzYnOblJQgCCas7EW t7qGMZFw2yjuZUoXPYWUFcsX4ObBuE+B+62hIJr/VecL6GQqXJqbw3tFzPh6o6WY11Dt AaZsGxZgo+a0KeyrZfN2k3OQ6Opi6vB30NX3kHsYrC0xC0dXitL93bqDSDdnCIRqjCct AYbajLERTwGQMj0pLXtlHUczlEn7sMWYhwirNxoOQJ8plac4BKZ1XZ4Nmm0kbQ6+qhTQ 0Zjq84Jrn9sUJaPXwZtpoa2lmYErq1SajtqwCEWMeJH5dGnfYnKV+c7vhkce/WonQD/i JQpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=VADkbwef; 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 lf11-20020a170907174b00b00a3d95693200si2177569ejc.591.2024.02.26.06.23.42; Mon, 26 Feb 2024 06:23:43 -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=@intel.com header.s=Intel header.b=VADkbwef; 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 8287F68C7D7; Mon, 26 Feb 2024 16:23:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A65A66881DA for ; Mon, 26 Feb 2024 16:23:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708957417; x=1740493417; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/IbG4FECoz6sNC4CZqbUqxDgSmraI6x1mPXqLa2Q9JU=; b=VADkbwefQGVWHI8e//rosv1xgjdHdvC3cKSJPZHulTLf4jKJIGxoCydq kfBAzqN+aCh37ZWUYS8wQ1HwLqGXDRqj6DWyoi5aUrFRHfo1QreAzT3MZ ma6apZdMwBkzzbj8OLA6MUOXPSsEAm2XYxxSO/lZOTy583udqyItMr6pX +B+SFG7DS8Iz87/QaUIxMfDrIlUNWvV7NXhQmFa6ptOua27KyIlKWj632 fAS+D4IXNmU6MWI8UTzR+aWYU4yTpUTaD9HIpjz4WTL/1e2/KSS1baOjA G0QYsdJT7dgJN356gWC/MP0WfZK6nuYGh20JvjXbnaMGphdVHmwnigeUJ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10995"; a="13797948" X-IronPort-AV: E=Sophos;i="6.06,185,1705392000"; d="scan'208";a="13797948" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2024 06:21:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,185,1705392000"; d="scan'208";a="6818042" Received: from gnr-bkc.igk.intel.com ([10.91.102.233]) by fmviesa008.fm.intel.com with ESMTP; 26 Feb 2024 06:21:14 -0800 From: Hanna Ciebiera To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 15:21:01 +0100 Message-ID: <20240226142101.401835-1-hanna.ciebiera@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/ff_filter_frame_framed: Fix setting up filter frame 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 Cc: Hanna Ciebiera Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7a+sBBzZBdSu Up to now filter_frame was incorrectly set up to dst->filter_frame in if statement. It was causing conversion failure during the transcoding. Now, when condition in if statement is met filter_frame is set up to default_filter_frame. Signed-off-by: Hanna Ciebiera --- libavfilter/avfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ab7782862a..5da17f3160 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -951,7 +951,7 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) AVFilterPad *dst = link->dstpad; int ret; - if (!(filter_frame = dst->filter_frame)) + if (!(filter_frame == dst->filter_frame)) filter_frame = default_filter_frame; if (dst->flags & AVFILTERPAD_FLAG_NEEDS_WRITABLE) {