This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 1778991846f239195aa17bad48fa47e4beca1438 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sat Feb 21 15:38:20 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:18 2026 +0100 avformat/avio: Fix shadowing Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavformat/avio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index b146ac9f19..c685e0ab71 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -57,7 +57,7 @@ static void *urlcontext_child_next(void *obj, void *prev) #define OFFSET(x) offsetof(URLContext,x) #define E AV_OPT_FLAG_ENCODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM -static const AVOption options[] = { +static const AVOption urlcontext_options[] = { {"protocol_whitelist", "List of protocols that are allowed to be used", OFFSET(protocol_whitelist), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, {"protocol_blacklist", "List of protocols that are not allowed to be used", OFFSET(protocol_blacklist), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, {"rw_timeout", "Timeout for IO operations (in microseconds)", offsetof(URLContext, rw_timeout), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_DECODING_PARAM }, @@ -67,7 +67,7 @@ static const AVOption options[] = { static const AVClass url_context_class = { .class_name = "URLContext", .item_name = urlcontext_to_name, - .option = options, + .option = urlcontext_options, .version = LIBAVUTIL_VERSION_INT, .child_next = urlcontext_child_next, .child_class_iterate = ff_urlcontext_child_class_iterate, _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
