This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit c2d57412666577b17f9043c4c36641ad6aace86e Author: Niklas Haas <[email protected]> AuthorDate: Thu Jun 25 13:54:35 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Thu Sep 3 19:05:28 2026 +0000 avformat/libcurl: consolidate s->error and s->eof s->eof can just be AVERROR_EOF. Sponsored-by: nxtedition AB Signed-off-by: Niklas Haas <[email protected]> --- libavformat/libcurl.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/libavformat/libcurl.c b/libavformat/libcurl.c index bb5fa0f002..f50b71ed6f 100644 --- a/libavformat/libcurl.c +++ b/libavformat/libcurl.c @@ -150,8 +150,7 @@ struct CurlContext { pthread_cond_t cond; AVFifo *fifo; int paused; /* write callback paused, FIFO was full */ - int eof; /* producer delivered all data */ - int error; /* AVERROR for an unrecoverable failure, or 0 */ + int status; /* current stream status (AVERROR code) */ int aborted; /* transfer should stop (open was interrupted) */ }; @@ -309,8 +308,8 @@ static size_t header_callback(char *ptr, size_t size, size_t nitems, void *userd "with offset %"PRId64" (expected %"PRId64")\n", content_start, c->request_start); c->stream_ok = 0; - if (!c->error) - c->error = AVERROR(EIO); + if (!c->status) + c->status = AVERROR(EIO); pthread_cond_broadcast(&c->cond); pthread_mutex_unlock(&c->mutex); return len; @@ -360,8 +359,8 @@ static size_t header_callback(char *ptr, size_t size, size_t nitems, void *userd c->seekable = c->seekable_opt; } else { c->stream_ok = 0; - if (!c->error) - c->error = ff_http_averror(status, AVERROR(EIO)); + if (!c->status) + c->status = ff_http_averror(status, AVERROR(EIO)); } c->probed = 1; pthread_cond_broadcast(&c->cond); @@ -417,8 +416,8 @@ static void start_request(CurlContext *c) curl_multi_strerror(res)); c->active = 0; pthread_mutex_lock(&c->mutex); - if (!c->error) - c->error = AVERROR(EIO); + if (!c->status) + c->status = AVERROR(EIO); pthread_cond_broadcast(&c->cond); pthread_mutex_unlock(&c->mutex); } @@ -459,8 +458,8 @@ static void on_done(CurlContext *c, CURLcode code) received = c->request_received; /* Advance past delivered bytes so a retry or seek resumes at the right offset. */ if (received > INT64_MAX - c->request_start) { - if (!c->error) - c->error = AVERROR(EIO); + if (!c->status) + c->status = AVERROR(EIO); received = 0; aborted = 1; pthread_cond_broadcast(&c->cond); @@ -475,8 +474,8 @@ static void on_done(CurlContext *c, CURLcode code) pthread_mutex_lock(&c->mutex); c->probed = 1; c->stream_ok = 0; - if (!c->error) - c->error = curlcode_to_averror(code); + if (!c->status) + c->status = curlcode_to_averror(code); pthread_cond_broadcast(&c->cond); pthread_mutex_unlock(&c->mutex); return; @@ -493,7 +492,7 @@ static void on_done(CurlContext *c, CURLcode code) return; } pthread_mutex_lock(&c->mutex); - c->eof = 1; + c->status = AVERROR_EOF; pthread_cond_broadcast(&c->cond); pthread_mutex_unlock(&c->mutex); return; @@ -512,8 +511,8 @@ static void on_done(CurlContext *c, CURLcode code) if (!aborted) { pthread_mutex_lock(&c->mutex); - if (!c->error) - c->error = curlcode_to_averror(code); + if (!c->status) + c->status = curlcode_to_averror(code); pthread_cond_broadcast(&c->cond); pthread_mutex_unlock(&c->mutex); } @@ -552,8 +551,7 @@ static void execute_command(CurlLoop *loop, CurlCmd *cmd) pthread_mutex_lock(&c->mutex); av_fifo_reset2(c->fifo); c->paused = 0; - c->eof = 0; - c->error = 0; + c->status = 0; pthread_mutex_unlock(&c->mutex); c->request_start = cmd->pos; c->retry_count = 0; @@ -956,7 +954,7 @@ static int wait_for_probe(CurlContext *c) int ret = 0; pthread_mutex_lock(&c->mutex); - while (!c->probed && !c->error) { + while (!c->probed && !c->status) { if (ff_check_interrupt(&h->interrupt_callback)) { c->aborted = 1; ret = AVERROR_EXIT; @@ -966,7 +964,7 @@ static int wait_for_probe(CurlContext *c) } if (!ret) { if (!c->stream_ok) - ret = c->error ? c->error : AVERROR(EIO); + ret = c->status ? c->status : AVERROR(EIO); } pthread_mutex_unlock(&c->mutex); @@ -1072,12 +1070,8 @@ static int libcurl_read(URLContext *h, unsigned char *buf, int size) curl_dispatch(c->loop, CMD_UNPAUSE, c, 0, 0); return n; } - if (c->error) { - ret = c->error; - break; - } - if (c->eof) { - ret = AVERROR_EOF; + if (c->status) { + ret = c->status; break; } if (nonblock) { -- 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]
