---
We could use it in more places and Vittorio will need it when adding
aliases to pixel formats.
libavformat/format.c | 20 +-------------------
libavutil/avstring.c | 21 +++++++++++++++++++++
libavutil/avstring.h | 10 ++++++++++
3 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/libavformat/format.c b/libavformat/format.c
index 3a510cd..2fa13b4 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -97,24 +97,6 @@ int av_match_ext(const char *filename, const char
*extensions)
return 0;
}
-static int match_format(const char *name, const char *names)
-{
- const char *p;
- int len, namelen;
-
- if (!name || !names)
- return 0;
-
- namelen = strlen(name);
- while ((p = strchr(names, ','))) {
- len = FFMAX(p - names, namelen);
- if (!av_strncasecmp(name, names, len))
- return 1;
- names = p + 1;
- }
- return !av_strcasecmp(name, names);
-}
-
AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
const char *mime_type)
{
@@ -177,7 +159,7 @@ AVInputFormat *av_find_input_format(const char *short_name)
{
AVInputFormat *fmt = NULL;
while ((fmt = av_iformat_next(fmt)))
- if (match_format(short_name, fmt->name))
+ if (av_match_name(short_name, fmt->name))
return fmt;
return NULL;
}
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 3ea7be0..e42ee26 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -234,6 +234,27 @@ int av_isxdigit(int c)
return av_isdigit(c) || (c >= 'a' && c <= 'f');
}
+int av_match_name(const char *name, const char *names)
+{
+ const char *p;
+ int len, namelen;
+
+ if (!name || !names)
+ return 0;
+
+ namelen = strlen(name);
+ while ((p = strchr(names, ','))) {
+ len = FFMAX(p - names, namelen);
+ if (!av_strncasecmp(name, names, len))
+ return 1;
+ names = p + 1;
+ }
+ return !av_strcasecmp(name, names);
+}
+
+
+
+
#ifdef TEST
int main(void)
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index b7d1098..d85cd4c 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -219,6 +219,16 @@ const char *av_basename(const char *path);
*/
const char *av_dirname(char *path);
+
+/**
+ * Match instances of name in a ','-separated list of names
+ * @param name Name to look for
+ * @param names List of names
+ * @return 1 on match, 0 otherwise
+ */
+
+int av_match_name(const char *name, const char *names)
+
/**
* @}
*/
--
1.9.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
