[FFmpeg-devel] [PATCH 58/60] avformat/avio: fix variable shadowing

Marvin Scholz epirat07 at gmail.com
Mon Sep 9 03:40:15 EEST 2024


---
 libavformat/avio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index d109f3adff..fd767c9ba9 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 url_context_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           = url_context_options,
     .version          = LIBAVUTIL_VERSION_INT,
     .child_next       = urlcontext_child_next,
     .child_class_iterate = ff_urlcontext_child_class_iterate,
-- 
2.39.3 (Apple Git-146)




More information about the ffmpeg-devel mailing list