Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-11 14:59:58 +01:00
commit 8a1c79024d

View File

@ -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);
}