This will extend the whitelist features to allow blacklisting individual
protocols and to
explicitly force everything to be enabled.
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavutil/avstring.c | 15 ++++++++++-----
libavutil/avstring.h | 5 +++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 57fe74d..85fb3e9 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -326,13 +326,18 @@ int av_match_name(const char *name, const char *names)
return 0;
namelen = strlen(name);
- while ((p = strchr(names, ','))) {
+ while (*names) {
+ int negate = '-' == *names;
+ p = strchr(names, ',');
+ if (!p)
+ p = names + strlen(names);
+ names += negate;
len = FFMAX(p - names, namelen);
- if (!av_strncasecmp(name, names, len))
- return 1;
- names = p + 1;
+ if (!av_strncasecmp(name, names, len) || !strncmp("ALL", names,
FFMAX(3, p - names)))
+ return !negate;
+ names = p + (*p == ',');
}
- return !av_strcasecmp(name, names);
+ return 0;
}
int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t
*buf_end,
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index a46d012..ea08d4f 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -284,6 +284,11 @@ const char *av_dirname(char *path);
/**
* Match instances of a name in a comma-separated list of names.
+ * List entries are checked from 0 to the end of the names list,
+ * the first match ends further proessing. If a entry prefixed with '-'
+ * matches than 0 is returned. the "ALL" list entry is considered to
+ * match all names.
+ *
* @param name Name to look for.
* @param names List of names.
* @return 1 on match, 0 otherwise.
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
