From patchwork Mon Oct 2 15:31:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp1480731pzf; Mon, 2 Oct 2023 08:31:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEeNu5Mvi248rD/NcP8nuFbwvywiVDO9wbEwADWSxlpxtrdEEmeIhJcOzr4rMvI9ZG5NWu X-Received: by 2002:a17:906:116:b0:9b2:ba66:c436 with SMTP id 22-20020a170906011600b009b2ba66c436mr9582775eje.68.1696260700812; Mon, 02 Oct 2023 08:31:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696260700; cv=none; d=google.com; s=arc-20160816; b=gVA0BHfoTvwjTPH0jUy4E4z+x2shBd8//Bl68w8aBCNJJtDa5fqC0knm6yw0HZ0S5j lzBFNwWPu4fVCpIWqKUQCIBbVFJIplJHnuyoPo1W5jmNn8tCNKTKOMRGs4JmD0L7POn/ 4AQw6/hdADKnDr/yt+Cd1fBW5HLiHk6tlq8aqYPB5D5EXsBpourC2uRCGMZsqz6a5ndW nkflTbtu/dN/8sKnIHDR0o1nF2peS+UAQ9nNy2BySMrtkKTa5GArvTRonfDdhsZwksFW dUBPKnI+a/VgbouDso37dQeXFOauZ7u7971iDID3onZejQ+XyvIEWClpw4ShRDnNhQmE Q3Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=+nxRxHDW6uR7mij//sVQ5NnuukReCcBI8oNx8h79Wmo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=eWQRUXWwiZJxkXvDE+wJUzS2ZcK4M1Zj5xRYgcb4O3A4wwr2gTaTPbdUuOEmTgzaN6 HIILcTIhSV/VW5srqFLtooVr6rTXR7raw8XBW1EVwZbhAXvDkrHiUU+fTkBGC3wwcIVA +eA4gY+l2bBQVif9M7IKoNh3sBxU5yicXXS0egAQEptCeZzT1LY2xSDbKbLplECqQ69w krnOsQ44jsMN5IFTwutkol1U8uCf+lnDhuBjK6jl11IVxL4M7cw5silhh+/jXWn2tA6n UlS9KCQHA0dOEVvqF3XIV5dI0p2odEbj6v16wBx8Bjk3+CuUrlBFi+XvkXwIQ/ZSTUSN Ojmw== ARC-Authentication-Results: i=1; mx.google.com; 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 qf22-20020a1709077f1600b009b2b9bfc986si6799350ejc.351.2023.10.02.08.31.17; Mon, 02 Oct 2023 08:31: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; 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 D34F968CD05; Mon, 2 Oct 2023 18:31:12 +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 85B8E68CCDE for ; Mon, 2 Oct 2023 18:31:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 20217FF823 for ; Mon, 2 Oct 2023 15:31:04 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Oct 2023 17:31:01 +0200 Message-Id: <20231002153103.21846-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-Spam-Flag: yes X-Spam-Level: *************** X-GND-Spam-Score: 230 X-GND-Status: SPAM X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vaapi_encode: Avoid double AVERRORS 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SeqM2yOVCBQa Signed-off-by: Michael Niedermayer --- libavcodec/vaapi_encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index e3820956d16..6c3e41fb318 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -834,7 +834,7 @@ static int vaapi_encode_output(AVCodecContext *avctx, if (pic->tail_size) { if (ctx->tail_pkt->size) { - err = AVERROR(AVERROR_BUG); + err = AVERROR_BUG; goto end; } From patchwork Mon Oct 2 15:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp1480846pzf; Mon, 2 Oct 2023 08:31:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9gc0oJjrsEwrwdeTwcdfcgZ9GB9t/gtOQkte6HxkrBlRnIPB6Jd9jB8FQ1wfIxDE7r5su X-Received: by 2002:a17:906:3199:b0:9a9:f0e6:904e with SMTP id 25-20020a170906319900b009a9f0e6904emr11721600ejy.16.1696260710648; Mon, 02 Oct 2023 08:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696260710; cv=none; d=google.com; s=arc-20160816; b=TGD0EuP4DGztRnRonmQAzifg7W7ImrvuTyjan4fZ5Ewp7ra3oeJyh4/OcqrZEXazRu 02PxGnu3XJ9DbEjgwcv54CzniBmBb4tYLXUsqqhJdXqnXsgJTmIUozFUUitJ5nKFYRHn CAqFRTtnzP8lOTbstL2VHI4JgR4pORn8P4+/85neVTbhWRYlrmQ4TlLQfKYQS+50xwi7 qVuX7DkrnssKQOrCI/l7RqsLbYtm3L4gwwkeqt7eFCLWAwnljm+5epNM/ZCHv/0pdByr Auh2PeVFrn0Kt1V7O2j7hSq9xbhu2NUwnD171p1CpJzn7LBm6ZB0hY0zOSkDmWwZzu4N tcAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=4/pERt/Zzn3bc0CyFU5F2qHtd38m53koTQYUqHyo9LI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=a77vNGyY6ZPg67mnjuMkd5k1fEOqiWkrMtkjK0dqhE4wzIuaARtGtKL8yy+Szncjge aCEPmX9dhITm5ZpcFEG/qdpH4qT34j6UBy4hgprLUSYe8tBZLeCiFxXwNTz3am6LtuBR 4wY0p/Tx8Y2bKNQsC+2Gez+im92eKUSNvAKz8ZhMlmFEOZBRWAZfjs9pCq8Fk0Wd5pXW Mzvnat+Pm08GgXGrwY5JqbzzNPrskjXCip+16F253w+qAduLlJMJSFO4KXKy5eMegWEh A6K6DGKUAQll+89pHG0aocWsMu0DkemOWv8FwS7CNNYZmHmoreou2/LvB66vu7wxDzPj cwmw== ARC-Authentication-Results: i=1; mx.google.com; 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 w22-20020a17090652d600b0099da220412csi18461706ejn.1053.2023.10.02.08.31.29; Mon, 02 Oct 2023 08:31:50 -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; 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 0C3FF68CA3F; Mon, 2 Oct 2023 18:31:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15D5C68CCDE for ; Mon, 2 Oct 2023 18:31:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4282740012 for ; Mon, 2 Oct 2023 15:31:05 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Oct 2023 17:31:02 +0200 Message-Id: <20231002153103.21846-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231002153103.21846-1-michael@niedermayer.cc> References: <20231002153103.21846-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_vidstabdetect: Avoid double AVERRORS 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PvsPJYdVhuFV Signed-off-by: Michael Niedermayer --- libavfilter/vf_vidstabdetect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index a2c6d895037..641040008a6 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -167,7 +167,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } if (vsMotionDetection(md, &localmotions, &frame) != VS_OK) { av_log(ctx, AV_LOG_ERROR, "motion detection failed"); - return AVERROR(AVERROR_EXTERNAL); + return AVERROR_EXTERNAL; } else { if (vsWriteToFile(md, s->f, &localmotions) != VS_OK) { int ret = AVERROR(errno); From patchwork Mon Oct 2 15:31:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp1480940pzf; Mon, 2 Oct 2023 08:32:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3vuPeSN3x9NJJlOIpU02bNAB5YcNZIRLQN0OoYRq+xpPtrlaiGIkov8qENtmhn4OkL0D4 X-Received: by 2002:aa7:d451:0:b0:52c:9f89:4445 with SMTP id q17-20020aa7d451000000b0052c9f894445mr10445035edr.21.1696260720206; Mon, 02 Oct 2023 08:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696260720; cv=none; d=google.com; s=arc-20160816; b=l4LrJypjCRAjhShAA6neY0fWMRnXQ/lvpBxHPJdVE050OKV1LSIxEBYotGKCf/Nrip 0FdZz/W/iE81FGrJjVT/T0J2HyWrlLkAYKviGTU73oJikFirBlugOkbhK9zKWkTxBKi6 DiWIeKllamHeOASvtfvPD+nu2/mr/DX0MrahHm/vuEx549S4fylqEEsqJS9K5cZ+PtrC RHOLB1oLXZXxB+/+BjnZfTT6Zr/Zm3ryCnPfhBg0JaNOtW7sHdkz7cLN3SMAXce7ccmG MK7DDSU7nmv0NxyNpRe/5NVhjUD/wuzQjGt+0z9UeauW69CJq7XtzydHoE0Mo83kY2Vi +0pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=H6N9YfxPA7GRqoJZCSPgkehVP2Xk8hIEdre0ToZAJ3k=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=lXSoReuNN/JzJJv+X8nfN7ZYpSvWOTEckz8mrnDUmSwxlfQ+3ZqeNGlpNn8ixzCarS XHUNoE03RWQEl91YAOljhPkylc7V6Z0/iJnEf6MOi3xIdlEDmV1+q/Q+PPiUtgutkM9b SRDrU+hnD3sxBqrVuD4UprXVaIi3Nws7k99DvsxQYvdlM4d1Bd3x7wK7H84e2VZFAt8C 9MiYAizIcxnebPcSsrALFuWl8VJio2nSvnp2h5YWfCfRwuGfzMQwRTOiFzbHDK5uk1Tc kPNsLIri3wjdsOQFc2R3DQ0tIX2JYGpNv1xOppC0ExiBKgKB8r50xjbRVU1MevtGExt+ OB6g== ARC-Authentication-Results: i=1; mx.google.com; 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 u20-20020aa7d554000000b00533f2e2c17bsi10625926edr.70.2023.10.02.08.31.39; Mon, 02 Oct 2023 08:32:00 -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; 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 21A9868CD3E; Mon, 2 Oct 2023 18:31:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B821068CD04 for ; Mon, 2 Oct 2023 18:31:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1BFEA4000E for ; Mon, 2 Oct 2023 15:31:06 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Oct 2023 17:31:03 +0200 Message-Id: <20231002153103.21846-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231002153103.21846-1-michael@niedermayer.cc> References: <20231002153103.21846-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avformat/flacdec: Avoid double AVERRORS 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d/yb5+ueON+l Signed-off-by: Michael Niedermayer --- libavformat/flacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 5104f231105..ab9ef052f9f 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -78,7 +78,7 @@ static int flac_read_header(AVFormatContext *s) /* process metadata blocks */ while (!avio_feof(s->pb) && !metadata_last) { if (avio_read(s->pb, header, 4) != 4) - return AVERROR(AVERROR_INVALIDDATA); + return AVERROR_INVALIDDATA; flac_parse_block_header(header, &metadata_last, &metadata_type, &metadata_size); switch (metadata_type) {