From patchwork Tue Jun 11 21:59:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp100054vqq; Tue, 11 Jun 2024 14:59:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUixUx7U/z/lMO4FxwTxMEJWfoPsPVcfI7LvnaBJFAWqDut3eoAvqXnD0TZeVgsSER+hdVVkvFEDLejcZEeRUok2Fzo0msu8cf48Q== X-Google-Smtp-Source: AGHT+IFoHH4OA4l9/slOocJ7tvVsXafRx7f2Ngg6hZixpE0OQj+jTxoLdbWa/5C/VCgOhEMBN8gi X-Received: by 2002:a05:600c:c11:b0:421:8e64:5f36 with SMTP id 5b1f17b1804b1-422863ae0damr2324845e9.14.1718143183357; Tue, 11 Jun 2024 14:59:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718143183; cv=none; d=google.com; s=arc-20160816; b=WVvTiswr7nlyjBL26uef+YEtOCYX6UVWY9FaZTpbpXblXD1xrPJ0A1MzKYwW/f5w58 zP6zrHRBKtWScn0uto6WvA9+ciLSe3M9fy5+MIUO86nS/m3VXqNCmFruGRfHS6ialZF5 XwYbjTgViPPi6I0207yII3oL+oSNy7mjsk3d0jP8+2dXk4uoYc28h7zmUnBe2RbKdnj1 ET2Ek4k5e1lpP0D2SnAplGU8TeOfnfJwjkIA89Lz1qjGGEZbxGTUj0VsXbvYxcWPskXV +dEYJjscsmK22Cq17BTgqhhFufW3ciN3j4PwLYMy4gPHcWoG1Io/7wSyB/OMae83Kruj hPOw== 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=xXa8mw3gRk8tO9Z8lXj7NbSK853HYsEox9cODyYF+jk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=PaoqBWLJt58yXq5YTb9QfUmx14kpl8h9/I/tFeVyVeXV/fWaNs1lZa5QUL/PMUdgwi g0ly+WB0oyul58Hc3fxNSpMXHWMptjAytXphBIL8iTvThGywG8fogd6WnWYSc1u+xI7D OeOQGbamr5u7EGztiqA45fj5TVozWdo0Kj3qVuK6fq4yP0BGB3Mjmtb+Hy+JVUMeGzGE fEMliIHGJGWPaVemPRu1cwaD38Ve1LpFsusFnLCpamF14C4ey+3aqC0orPiyWMV0dqgI Ec8zoePoWYSDsg6Z8Cb1f79OSQsH8D6X89p/QjxGOv0cMX4ueMsY3plhKRMZsrXcWZAe h5Iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=dZ1kdati; 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 a640c23a62f3a-a6f100002b7si338023766b.695.2024.06.11.14.59.18; Tue, 11 Jun 2024 14:59:43 -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=@niedermayer.cc header.s=gm1 header.b=dZ1kdati; 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 1E7DD68D8D0; Wed, 12 Jun 2024 00:59:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C5EC68D756 for ; Wed, 12 Jun 2024 00:59:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D08961C0002 for ; Tue, 11 Jun 2024 21:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718143148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=j/3nWG3Xt78BUPao2PAj+RBRAkoi/VCNuh87Kk7v9XI=; b=dZ1kdatiMnnxopn6Mwwjz6YXl2NegeaShYQTup8YjJPoGnKTaveYlUNEDFrxqJD/YERaDz gU250RcJ7EnLstovGCL5qSEa4wRBlCILBPnEBtQajbgTUoeVYqI3jQ+de/PBtSVL4oBm0S RfnPcgVExyb9Smjf6zni+vkUbvPFqlGqfPUUUczAX1kT+WQpoEv9KRVzRKEIirbY2i/agF sGvHJ9JENjW5O5YA35u+eG9VpuS+u3SDwIbp3rDwJVBBENvheUbZJ3BBAR76DZx/k08OF2 RoPIdwL+4BfWQ1vNUGAGt00Vaix2ge7Qp5SXx3I5F/MkpISz6cnXRJ2QqkXL6Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jun 2024 23:59:03 +0200 Message-ID: <20240611215906.1106071-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/avf_showcwt: Check av_parse_video_rate() for failure 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: ZGcaMYTeH/rb Fixes: CID1539147 Unused value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/avf_showcwt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 24d16d9075d..89a019a0d41 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -1028,6 +1028,8 @@ static int config_output(AVFilterLink *outlink) s->auto_frame_rate = av_make_q(inlink->sample_rate, s->hop_size); if (strcmp(s->rate_str, "auto")) { ret = av_parse_video_rate(&s->frame_rate, s->rate_str); + if (ret < 0) + return ret; } else { s->frame_rate = s->auto_frame_rate; } From patchwork Tue Jun 11 21:59:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49810 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp99967vqq; Tue, 11 Jun 2024 14:59:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4EFq2JCQlkH1pbAKMTVALPXzTCnZk5mekInIL16FqNqD7xavcEmhMqxYzlUblSxw7nWH35LCjOd0MiRZwNyhSvGBB8SbeyUIh+A== X-Google-Smtp-Source: AGHT+IFbc3YE8ZcLqkPkjnxgr4wpDtmJApPQw2A19AIybaFIOd1Cw4BUpikCtpkhp/3Dr4fHFdl+ X-Received: by 2002:a17:907:94c1:b0:a59:dd90:baeb with SMTP id a640c23a62f3a-a6f48012dbdmr505066b.48.1718143169537; Tue, 11 Jun 2024 14:59:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718143169; cv=none; d=google.com; s=arc-20160816; b=DqcbPq4TFjSRIusSkvpnM7BCHq1FONNDMMQrWvufzPBbBIEdjrzupoishbpw3/jQdy MxrWM5Aj7IgMePnhlNzLnNDfoBzbNEMlrukuxIhAZoiCyhXLI5KSSUMjpiJzxuaJiL5d NQIGKz/YFs8KBuiDW52WdOGS3Ic+6IUv/ZhLjgshLPTr3LEg/9Agbf/HlBooi+gX5If5 PGar+s9OFuo4ADXtWZbMewjaRTrnIuc/t+kMDk32YbxsqQh5sds+pLFDXTPBvt/H1ds7 4fd06o3QhMGKa35pB3KSVc2Yo5q4a2SI95oI5LDBj+wPo3tQpjB7nLFGR9IktyNLRfGy 86dw== 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=f4BEWvR3nAeSgvbBYmZD3NVSQ9KAL4cmvOXZKSwsxKo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=0bTuhGUrZXfmhhP+0ftZNsIRGv/3yAgZHICGyMUe4AFkrrxzsavCKKva4oCHBkHbRb 7oCjDPI8aOYCsY2A/ujs6yYG7BWJKUAgQvjyt3lLkpUaSHl/TZw0uMbOBgID5gRwMNsB uz8jgGQTn0ONx/VP15bifB4iGovzhLCnJEOfsmKxRCarfulzZTP31VRkKFpuLSSdA1sO 5fncws5Xn+/DWkndJY9vbqldisQrNBjZBywTlldyOIuzWjK1ruElABXvxhAs6wpYcD7q YGoE38pGSnJvGX4ZGACmds1xY3H4m40/PouBsfKnvUezFSrOSR04BHZBpksDzWSysL71 gF5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=pUGjMEez; 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 a640c23a62f3a-a6f20b79f35si217024266b.66.2024.06.11.14.59.29; Tue, 11 Jun 2024 14:59:29 -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=@niedermayer.cc header.s=gm1 header.b=pUGjMEez; 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 90A5A68D8E1; Wed, 12 Jun 2024 00:59:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F295E68D876 for ; Wed, 12 Jun 2024 00:59:10 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6215C20003 for ; Tue, 11 Jun 2024 21:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718143150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RTaZI6nf7MsqgqxrnqSnx3hW+kpW+I3aAS81BzSWCaw=; b=pUGjMEezEcu+gR5ZM0N+qfAc629KDtWg/wjWaYh2fs0le+btNoReGxWckt5k6HB8WZ6/dk pLVtfg41VHR6dkhC4RZbFNqDztnZVvTStEnE3eogGkml6HVl0Md/H4nabEgNwSOTue65FS gRDqMQmvrWH7sS/vPD/s8xVHHZIDvFsDvfd8Qhz2naVnkMQSq2MMHXHN0trQHnMtZkJgP1 E6CdsQObM3FvoLZrGEhvY3+ECT6kzzjQVN18op2/CxvL4mbB1mH6KzmzO04I0gVV/W7awJ TycyEk67tDUCCOolTnQ1x3RbVxx7dXiOIYUh/kK51GiBWuWSER+WyN0fk9smjw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jun 2024 23:59:04 +0200 Message-ID: <20240611215906.1106071-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240611215906.1106071-1-michael@niedermayer.cc> References: <20240611215906.1106071-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/drawutils: Fix depthb computation 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: khfBfH6Op0Z1 Fixes: CID1496940 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/drawutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 1081938d867..95525d38b40 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -61,6 +61,7 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt) had0 |= pos == 0; rgba_map[i] = pos; + depthb = db; } if (desc->nb_components == 3) From patchwork Tue Jun 11 21:59:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49811 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp100042vqq; Tue, 11 Jun 2024 14:59:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJcW8NBfQOZe7/49LWCVTez4sYo0zcGDn0TAsDF+tb3LEPkgKM9Os768DWvKLOzMHiGHFR2+jXfwqMWlEc42rXPhITnDI+RUn6bQ== X-Google-Smtp-Source: AGHT+IHOH+2ogmHZcYd6rrqeclVByXqZozficzhjgVnbdFMw6teV+qX7nGZbDsm6X7g4GgI+cNdc X-Received: by 2002:a19:435a:0:b0:52c:983d:d2b6 with SMTP id 2adb3069b0e04-52c9a3c6f3dmr15803e87.24.1718143180425; Tue, 11 Jun 2024 14:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718143180; cv=none; d=google.com; s=arc-20160816; b=L44m3r9SNQf3vNvOQSgNGMXZiH9WPvTANBu81/r3mVFt8xRz95oWarTSx6ad8AQQSv G22fgB9AaXx4ektjptdMJqBtULv8OOTcs+uNtyX5psJDOV+CAHxOqaZVXbxN2ibrXhu9 cm1FBSPOrzxcAy1bYeI5pMBCgiynSn2maD7a3U3QZq4avkDoucN0eZ817aYdemCDnvn9 k6JbT9h6ip3VvfHV3zIgdVjdkj7RqMlvOvRFk7hfTJ/Om5xZqYQHJ/4LFMVLITukTSLW jc93f/Nux7vmYj8Ws/7kxx2NHmI16acyL8h91qpBOW5Hy5fCC3RcAkO47ajZEexk5x6e Z+Sw== 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=9/spu12h//6PddUQH7Qs4TBJleedgZLxnc0s84XRrjk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Bj0e1Nhw9e8CmpPjcfniWQ+06jQZOlsR8om5LPTacGARhwuKxE0WaP7ige3E2ESv/T ChdHAinECmjTdVXK/D2RP3NQk6FOuQvhAJ5m5fbLlY9rvG1XhhE+aDIU1//szLazWlbC hHrMoq7mx4E3m/1DlNhjfP98hCo++V4kyPrZG19QIc2yOxwczg9C0QeLBsXLR0VX5aoB 0G9E5I5DN55f0+lRAowOSf3RN55A8dLszhEb+e54oD6XKje6FgyjarIA/rCnECPRpTV2 C8cKkv3QA1LFtPB66xkC3/W39wl65A4Y9J5aKt65xvbni4iD2+77Fx5CZQ1SQ7wbAeSF eauw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=cuYb3OiJ; 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 2adb3069b0e04-52c6aef070bsi2348514e87.398.2024.06.11.14.59.39; Tue, 11 Jun 2024 14:59:40 -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=@niedermayer.cc header.s=gm1 header.b=cuYb3OiJ; 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 D038768D8EB; Wed, 12 Jun 2024 00:59:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 375E468D8E1 for ; Wed, 12 Jun 2024 00:59:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4C998FF802 for ; Tue, 11 Jun 2024 21:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718143151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=njnnSk6TO3gsJtfpEYdgjmbFM2wQ5hWX9dAM/anWNpo=; b=cuYb3OiJr+DA8oTlgPeFYB3rDliBrzG7NPJ+zSwfdT8S8g/iKRlLYNW/bwtWSzLmY/fR+h zzc9JItvjDtCyCdbh26OT0vs2fal9DTDW03HTeSCIqx7HQ81VKBKOh+TBWa3GWZCqP0Jik OROCBFgtOPYilgyhaIQwZWXKZYOcz92CJLaeAmxYM2mubRPFNhHGaP57f2ikuurjgG0tLu YzO25UWlfdHHTbUNpE8bVIKrb6cEw4yKquvjtgWffSiV68KHEXEPdpkeJcYPFqlAQTweGu /ZAouLvMMPOwScybUhFefSFVA74IzUE2xf9zT+T4mJemS6xUlmDqKtAGe6E2jA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jun 2024 23:59:05 +0200 Message-ID: <20240611215906.1106071-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240611215906.1106071-1-michael@niedermayer.cc> References: <20240611215906.1106071-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/qsvvpp: Remove unreachable code 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: Cp3U8ZLVtjbY Fixes: CID1598548 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/qsvvpp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 1c9773df099..6adf9f6e841 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -1099,11 +1099,6 @@ int ff_qsvvpp_create_mfx_session(void *ctx, if (sts < 0) return ff_qsvvpp_print_error(ctx, sts, "Error creating a MFX session"); - else if (sts > 0) { - ff_qsvvpp_print_warning(ctx, sts, - "Warning in MFX session creation"); - return AVERROR_UNKNOWN; - } *psession = session; From patchwork Tue Jun 11 21:59:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp100084vqq; Tue, 11 Jun 2024 14:59:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnsOyfNSf1zzrGAv6Ql461/KPpK1WKpyI3r2zJXvJr7pGJyhDBnoQ1Nsw+oXktVyP3QE6fbbCSSxs8eIgzAtZYvpsVGKsgmCB6UQ== X-Google-Smtp-Source: AGHT+IHRc5s2xmxezIxUwwLdHWbxiQyJiAyliJOfkkS75rIA6ZvJ023Y19DXZviqfdxhfwhNFWun X-Received: by 2002:a5d:64c9:0:b0:35f:305d:d2c8 with SMTP id ffacd0b85a97d-35f305dd3d5mr1649794f8f.3.1718143188556; Tue, 11 Jun 2024 14:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718143188; cv=none; d=google.com; s=arc-20160816; b=CCYc8a5NnUgw0r1vvXUGtOQqu3WLzTO83AqUe6Dab0CIPWffHjkbdwoVZlTFxW7h3q HkQm+eWpj6Pyjsb4gciPGq6Z590Wp1JhlihBWa3CNhmeUa9jZ4en8PnhH/KpX/zo69Ye KiR712ECbCHNrUb1KqkntLYvNIAurfvDVlrQv/ReMPx1ZCLJtxxl1hdQNC5OsU2eLvIB 7DwukX+hFHcOctlOx397KWsQLhYBpIw4Ah2+NyzCmpXomZdbOgU2bIXu6fmqrtz9t9uw AjeL50Dwtfm8+tHRqmckNe2BRYVg3CqY7orY7MiaaQQ3IRPtBxQQOjmuqr+hVzUapPE/ ofPQ== 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=U+bQ5D3wOR7Enwf0HZvBWyxSb9Vlj769Kktz/dLetXw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=TTA0dA8QyWy20HMHItyfMM6SAOzqbtyv4bN5HOSndZ5UAtETFmvUBp1utpbhiWXE2t ikGQ63aTCjsPO+M7+6c8CH77M8CObfWjyASpoPecg/y0H3f4OHtBWGn+hZq6Vjc7U6es Hau7kRrsU6VKSFBly7P8U9wm01NgX5Ths6vF6JJz40czON+md5EADiEh5/YKQTxOfzQb pZNGMhuJMYYo/uboXwZRc8hn1rRYsdoyFXyLitmuSjd3CoqgvVzTUIa0z+p1hHsWYJhO eltlNXwjLDiCJv1/s8Lk1T/C2qxPwnAb6pWx/wu6jFaaQ7lKoy8JVVKX7Hhpc97gKhtX qsJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=K3BjBQyL; 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 a640c23a62f3a-a6ef71f0ca0si412696666b.323.2024.06.11.14.59.48; Tue, 11 Jun 2024 14:59:48 -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=@niedermayer.cc header.s=gm1 header.b=K3BjBQyL; 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 E017E68D8EF; Wed, 12 Jun 2024 00:59:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0A7D68D876 for ; Wed, 12 Jun 2024 00:59:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4FC30C0002 for ; Tue, 11 Jun 2024 21:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718143152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uHQXSXXE7kDxul68Tm3jz/rjw6R0oK/Fk9gbzeDjeJc=; b=K3BjBQyL8h+5JbD2qEDjjG+ZHE0HAVNYjmFtI00zdV6rxcUhk9f9i2bpAXlsXDKcfyKDs4 vstITjT5faRo3Rb00bz/p/IK0+2CG7HixparMs8luMFUpG28jfuYr2Y4GZ2GsZkV+1Sc6i m8klk3R2xQOIb0+4ZtmbyzKhgujtdOKRTAVnN41+LbNpqOsnfWBMtLwTJS+XCsq8yucp3E +FwZTWQw8VmGlvK9aPkTmboHnRUTPPnMbDkbL6geV6GQSrR85Tp5swJQA0yzEQ++R2f5wX brIB+4CBS7ffOxOnVco3Rrz/vKklPkDP7tP5KIvmZzbUHPOMaIeBg21Ac+Fh9g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jun 2024 23:59:06 +0200 Message-ID: <20240611215906.1106071-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240611215906.1106071-1-michael@niedermayer.cc> References: <20240611215906.1106071-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_avgblur: Check plane instead of AVFrame 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: TixHfVMUoRKq Fixes: CID1551694 Use after free (false positive based on assuming that out == in and one is freed and one used) Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_avgblur.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index ced0a2ac282..cbaeb974e5d 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -288,7 +288,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int width = s->planewidth[plane]; if (!(s->planes & (1 << plane))) { - if (out != in) + if (out->data[plane] != in->data[plane]) av_image_copy_plane(out->data[plane], out->linesize[plane], in->data[plane], in->linesize[plane], width * ((s->depth + 7) / 8), height);