diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 57fe74d2523d95a465626be8023b1689e535cb56..85fb3e921e4fbb2a54550818018d68b256f5606b 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 a46d012552f22dece95afa546acca6df76b2c804..15b04babef40e7cf088cfa24a24081b572e379e0 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 the start to the end of the names list, + * the first match ends further processing. If an entry prefixed with '-' + * matches, then 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. diff --git a/libavutil/version.h b/libavutil/version.h index 5352f2694935a7e44d98ec47c65bd58dca29c139..f99624c94b51046d0f167ee9ef12d9b23db36422 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -65,7 +65,7 @@ #define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MINOR 17 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \