Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 50352b53b20fb2b42d7b14b8e884552a75f38561..0f6f75cfa32663e05a873466a49c52261fb9245a 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -81,7 +81,7 @@ const IdStrMap ff_img_tags[] = {
     { AV_CODEC_ID_NONE,       NULL       }
 };
 
-static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
+static enum AVCodecID str2id(const IdStrMap *tags, const char *str)
 {
     str = strrchr(str, '.');
     if (!str)
@@ -99,5 +99,5 @@ static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
 
 enum AVCodecID ff_guess_image2_codec(const char *filename)
 {
-    return av_str2id(ff_img_tags, filename);
+    return str2id(ff_img_tags, filename);
 }