This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 90dae166b5017092293507bfc2e5f1452e94e97a Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sat Feb 21 16:49:51 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:18 2026 +0100 avformat/http: Fix shadowing Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavformat/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 52073ffcb6..32ec5192c4 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -165,7 +165,7 @@ typedef struct HTTPContext { #define E AV_OPT_FLAG_ENCODING_PARAM #define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION) -static const AVOption options[] = { +static const AVOption http_options[] = { { "seekable", "control seekability of connection", OFFSET(seekable), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, D }, { "chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E }, { "http_proxy", "set HTTP proxy to tunnel through", OFFSET(http_proxy), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, @@ -2143,7 +2143,7 @@ static int64_t http_seek_internal(URLContext *h, int64_t off, int whence, int fo av_log(h, AV_LOG_DEBUG, "Soft-seeking to offset %"PRIu64" by draining " "%"PRIu64" remaining byte(s)\n", s->off, remaining); while (remaining) { - int ret = ffurl_read(s->hd, discard, FFMIN(remaining, sizeof(discard))); + ret = ffurl_read(s->hd, discard, FFMIN(remaining, sizeof(discard))); if (ret < 0 || ret == AVERROR_EOF || (ret == 0 && remaining)) { /* connection broken or stuck, need to reopen */ ffurl_closep(&s->hd); @@ -2195,7 +2195,7 @@ static int http_get_short_seek(URLContext *h) static const AVClass flavor ## _context_class = { \ .class_name = # flavor, \ .item_name = av_default_item_name, \ - .option = options, \ + .option = http_options, \ .version = LIBAVUTIL_VERSION_INT, \ } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
