From patchwork Sat Jul 15 10:45:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4239269pzb; Sat, 15 Jul 2023 03:47:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlErYfAjo6eFpSSsH13sVULNRlYvFw0EsWHZKLhK49nPAsQUHycMsaH4ljqTV2maLdqCvgkE X-Received: by 2002:a17:906:c06:b0:98e:3cef:68ff with SMTP id s6-20020a1709060c0600b0098e3cef68ffmr5572196ejf.43.1689418043217; Sat, 15 Jul 2023 03:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418043; cv=none; d=google.com; s=arc-20160816; b=r92DrGGjBzAr4cCzyYCkNQMKJxl99Ry81vEGTuRNIsioGJ7Lcy255pZ8o1Ep2W4bYZ NY0fplGmJ+U3PWGRSgyAyh02Fiwq2T63VI7p4En1UQXowUu3kQXg7ADXIxlZEKbhg5mn ZY1L2F19aT0boZDzdD8gaad545Geuq8kFwtcBIZQXoWVZywd8GEYutg+HLXGLiYuNkhM FxMtOvdtM9Y7seilBjgIKIiAuurvcntdDE5HgvWVuG+R9fqZ9YTbLDVaTI8T0otEf1H2 27aqZq4hAsasHSzA+pdi7E9z0ta5kZzZ/B7SOESJBpehGTHHREwlyXICRqZ65aup/dJc xubA== 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:delivered-to; bh=453rznb5xeGo39IKto7xRUDwIn73y7Ik15qelzV0+D4=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=iD6F2Al2CvlTZ3LDurFkQ9TxaKebe/dx3+WDd+PbYEBgqOYdshLH2UffC2CEIRQl/C mLKbetFPoMfrgQrttTM8QT56mA3NXly4e6wxMlSjKNKa1ULZwC5aSltSAQ0M6a5/CAdZ 2v1TAafBtr6nlxbbn3bhW32MCf7u9JUWIm/8EKE1be6XlPg1TmWIB7/SGmrd4/TLehRA e5Akz9nctqXSM6xTtUIZkHVrWgxFr421Xk5J3I0xNNJXfvYBJYbasod9uv20E0TccFjt FUeQOW3WHpK1/jY2NdFkCppoGLORRgKNslsQCyzy4XViVEXXNg0bo/+8D15v1QQk7ZWQ /uDg== 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 op10-20020a170906bcea00b0098cf69d9447si9908314ejb.820.2023.07.15.03.47.22; Sat, 15 Jul 2023 03:47:23 -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 3E77068C647; Sat, 15 Jul 2023 13:46:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B39468C530 for ; Sat, 15 Jul 2023 13:46:35 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 394412404F5 for ; Sat, 15 Jul 2023 12:46:34 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id AZPLqxu_4cDu for ; Sat, 15 Jul 2023 12:46:33 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id D594A2406D0 for ; Sat, 15 Jul 2023 12:46:26 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id F2B8A3A1B0D for ; Sat, 15 Jul 2023 12:46:20 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:45:46 +0200 Message-Id: <20230715104611.17902-22-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230715104611.17902-1-anton@khirnov.net> References: <20230715104611.17902-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/47] fftools/ffmpeg_filter: replace remaining report_and_exit() with error codes 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: Plnu2uXlZqSz --- fftools/ffmpeg_filter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 470d7b1f02..26aff9c328 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -723,14 +723,14 @@ static InputFilter *ifilter_alloc(FilterGraph *fg) ifp->frame = av_frame_alloc(); if (!ifp->frame) - report_and_exit(AVERROR(ENOMEM)); + return NULL; ifp->format = -1; ifp->fallback.format = -1; ifp->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifp->frame_queue) - report_and_exit(AVERROR(ENOMEM)); + return NULL; return ifilter; } @@ -1781,7 +1781,7 @@ int reap_filters(FilterGraph *fg, int flush) fd = frame_data(filtered_frame); if (!fd) { av_frame_unref(filtered_frame); - report_and_exit(AVERROR(ENOMEM)); + return AVERROR(ENOMEM); } // only use bits_per_raw_sample passed through from the decoder