From: Guangyu Sun <sunguangyucn@gmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Guangyu Sun <gsun@roblox.com> Subject: [FFmpeg-devel] [PATCH] lavf/async: Fix wrapped_url_read return value Date: Sun, 18 Sep 2022 22:22:39 -0700 Message-ID: <20220919052239.2080-1-gsun@roblox.com> (raw) 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 <gsun@roblox.com> --- 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; } static int ring_write(RingBuffer *ring, URLContext *h, size_t size) -- 2.37.1 _______________________________________________ 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".
next reply other threads:[~2022-09-19 5:23 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-19 5:22 Guangyu Sun [this message] 2022-09-28 14:08 ` Anton Khirnov 2022-09-29 18:11 ` [FFmpeg-devel] [PATCH v2] lavf/async: Fix ring_write " Guangyu Sun 2022-10-13 14:55 ` Anton Khirnov 2022-09-29 18:15 ` [FFmpeg-devel] [PATCH] lavf/async: Fix wrapped_url_read " Guangyu Sun
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220919052239.2080-1-gsun@roblox.com \ --to=sunguangyucn@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=gsun@roblox.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git