Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

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

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

diff --cc libavformat/img2.c
index 50352b53b20fb2b42d7b14b8e884552a75f38561,3cfc08e161d884eff7ac52396ce433f4ee5c5c9e..0f6f75cfa32663e05a873466a49c52261fb9245a
--- 1/libavformat/img2.c
--- 2/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);
  }