From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 01164498CA for ; Wed, 21 Feb 2024 09:58:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E50F68D192; Wed, 21 Feb 2024 11:57:57 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE1F368CE09 for ; Wed, 21 Feb 2024 11:57:50 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=isYP9WPc; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 173CC448A for ; Wed, 21 Feb 2024 10:57:50 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id GqCORQZ4ea8X for ; Wed, 21 Feb 2024 10:57:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708509469; bh=Px4kFLoieW8cjj66nBjglT6aFvXg5j88Rm9XtbNY1YQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=isYP9WPcbVFRCY6OhNumhVivl85jo+8bbBsSeDVfvHgz6Cx1xZTqmv5bF0ma9CGLM /9vLnEoqpKrhooVKLeibeJDDV6cY0qqWOaYjsZQSnN36QhJcmIZpDzrJlUxfQkxJWz H+3a22eN0Bpe25oGtmFLc5yXF5174uXquxDJtBXBdDf9JIs2DJHf9UdOQtDLns7mfY udEv2Keo0A7Wh10d14bxS09y7EAqTwRqozcPosRNTqOEOelEbfEVzHOZgdoYoX9dVI 62amFWODL5raKL9gMAAV0OWDdztmTsCcqWX5yRqBZxiqZ0Sz1E+u2FN+J6rLozcPjr SHcv0zJjj+UCg== 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 mail1.khirnov.net (Postfix) with ESMTPS id 17FE619C0 for ; Wed, 21 Feb 2024 10:57:49 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id F1FB43A1684 for ; Wed, 21 Feb 2024 10:57:48 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Feb 2024 10:56:47 +0100 Message-ID: <20240221095648.5175-2-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240221095648.5175-1-anton@khirnov.net> References: <20240221095648.5175-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] fftools/ffmpeg_sched: simplify failure path in sch_dec_send() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- fftools/ffmpeg_sched.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_sched.c b/fftools/ffmpeg_sched.c index d91968822f..cb9d8c6905 100644 --- a/fftools/ffmpeg_sched.c +++ b/fftools/ffmpeg_sched.c @@ -2035,13 +2035,11 @@ int sch_dec_send(Scheduler *sch, unsigned dec_idx, AVFrame *frame) ret = 0; continue; } - goto finish; + return ret; } } -finish: - return ret < 0 ? ret : - (nb_done == dec->nb_dst) ? AVERROR_EOF : 0; + return (nb_done == dec->nb_dst) ? AVERROR_EOF : 0; } static int dec_done(Scheduler *sch, unsigned dec_idx) -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".