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 ECF7444149 for ; Wed, 28 Sep 2022 14:08:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E993668BCE1; Wed, 28 Sep 2022 17:08:48 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56B4968BCD5 for ; Wed, 28 Sep 2022 17:08:43 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D7010240183; Wed, 28 Sep 2022 16:08:42 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id VZHKIIbdaD-R; Wed, 28 Sep 2022 16:08:42 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (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 "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 46C2A2400F4; Wed, 28 Sep 2022 16:08:42 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 535B11601B2; Wed, 28 Sep 2022 16:08:42 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220919052239.2080-1-gsun@roblox.com> References: <20220919052239.2080-1-gsun@roblox.com> Mail-Followup-To: FFmpeg development discussions and patches , Guangyu Sun Date: Wed, 28 Sep 2022 16:08:42 +0200 Message-ID: <166437412231.22057.248171982435729520@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] lavf/async: Fix wrapped_url_read return value 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: Guangyu Sun 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: Quoting Guangyu Sun (2022-09-19 07:22:39) > This fixes a regression from commit 36117968ad. > > wrapped_url_read() used to be able to return positive number from > ffurl_read(). It relies on the result to check if EOF is reached in > async_buffer_task(). > > Test case: > ffmpeg -f lavfi -i testsrc -t 1 test.mp4 > ffmpeg -i async:test.mp4 > > Signed-off-by: Guangyu Sun > --- > libavformat/async.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/async.c b/libavformat/async.c > index 547417aa1e..a929f4d16e 100644 > --- a/libavformat/async.c > +++ b/libavformat/async.c > @@ -139,7 +139,7 @@ static int wrapped_url_read(void *src, void *dst, size_t *size) > *size = ret > 0 ? ret : 0; > c->inner_io_error = ret < 0 ? ret : 0; > > - return c->inner_io_error; > + return ret; This is wrong, FIFO callbacks must return 0 on success. This should be handled in ring_write() instead. -- Anton Khirnov _______________________________________________ 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".