[FFmpeg-cvslog] Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 11 14:59:58 2016 +0100| [8a1c79024da48ef44cc0ba5252ec6fc28e62453b] | committer: Derek Buitenhuis

Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
  img2: Drop av_ prefix for a static function

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a1c79024da48ef44cc0ba5252ec6fc28e62453b
---

 libavformat/img2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 50352b5..0f6f75c 100644
--- 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);
 }


======================================================================

diff --cc libavformat/img2.c
index 50352b5,3cfc08e..0f6f75c
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@@ -99,5 -100,5 +99,5 @@@ static enum AVCodecID str2id(const IdSt
  
  enum AVCodecID ff_guess_image2_codec(const char *filename)
  {
-     return av_str2id(ff_img_tags, filename);
 -    return str2id(img_tags, filename);
++    return str2id(ff_img_tags, filename);
  }