This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 4f7a381a0cfdeefb342d37d5640b2349e0da0b22 Author: Niklas Haas <[email protected]> AuthorDate: Sun Jun 14 11:51:22 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Mon Aug 31 19:10:45 2026 +0000 avformat/shared: allow interruption during BLOCK_PENDING read loop Also allows nonblocking calls. Sponsored-by: nxtedition AB Signed-off-by: Niklas Haas <[email protected]> --- libavformat/shared.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/shared.c b/libavformat/shared.c index 0be503f9c2..b649ac7d9e 100644 --- a/libavformat/shared.c +++ b/libavformat/shared.c @@ -712,8 +712,14 @@ read_block: pending_since = av_gettime_relative(); } + if (h->flags & AVIO_FLAG_NONBLOCK) + return AVERROR(EAGAIN); + /* Make sure we try a few times before giving up */ - av_usleep(s->timeout >> 4); + av_usleep(FFMIN(s->timeout >> 4, 10000)); + if (ff_check_interrupt(&h->interrupt_callback)) + return AVERROR_EXIT; + state = atomic_load_explicit(&block->state, memory_order_acquire); goto retry; } -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
