Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'

* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
  avstring: Expose the simple name match function

Conflicts:
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 20 deletions

diff --git a/libavformat/format.c b/libavformat/format.c
index e2eeb6ff09..4b3d55a2e3 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -104,24 +104,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)
 {
@@ -141,7 +123,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
     score_max = 0;
     while ((fmt = av_oformat_next(fmt))) {
         score = 0;
-        if (fmt->name && short_name && match_format(short_name, fmt->name))
+        if (fmt->name && short_name && av_match_name(short_name, fmt->name))
             score += 100;
         if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
             score += 10;
@@ -188,7 +170,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;
 }