aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/async.c
diff options
context:
space:
mode:
authorGuangyu Sun <sunguangyucn@gmail.com>2022-09-29 11:11:34 -0700
committerAnton Khirnov <anton@khirnov.net>2022-10-14 12:19:13 +0200
commitfc6f7e2a3b2fff6c4df957684d939586a3de448f (patch)
treeec5519d3bea55faff4a35b254260795c755d77cb /libavformat/async.c
parentfed841f6f9ca0251358f386411127bb248601349 (diff)
downloadffmpeg-fc6f7e2a3b2fff6c4df957684d939586a3de448f.tar.gz
lavf/async: Fix ring_write return value
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(). But FIFO callbacks must return 0 on success. This should be handled in ring_write() instead. Test case: ffmpeg -f lavfi -i testsrc -t 1 test.mp4 ffmpeg -i async:test.mp4 Signed-off-by: Guangyu Sun <gsun@roblox.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/async.c')
-rw-r--r--libavformat/async.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/async.c b/libavformat/async.c
index 547417aa1e..3c6f89cab9 100644
--- a/libavformat/async.c
+++ b/libavformat/async.c
@@ -144,8 +144,14 @@ static int wrapped_url_read(void *src, void *dst, size_t *size)
static int ring_write(RingBuffer *ring, URLContext *h, size_t size)
{
+ int ret;
+
av_assert2(size <= ring_space(ring));
- return av_fifo_write_from_cb(ring->fifo, wrapped_url_read, h, &size);
+ ret = av_fifo_write_from_cb(ring->fifo, wrapped_url_read, h, &size);
+ if (ret < 0)
+ return ret;
+
+ return size;
}
static int ring_size_of_read_back(RingBuffer *ring)