[FFmpeg-devel] [PATCH] lavf/async: Fix wrapped_url_read return value

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".
