diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 14:59:58 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 14:59:58 +0100 |
| commit | 8a1c79024da48ef44cc0ba5252ec6fc28e62453b (patch) | |
| tree | 01fad1d1899fdecdefbac5aba99a43a4a5fe10be /libavformat/img2.c | |
| parent | 8a6cc30b04287adf30ef24a27362fa3d0275f02c (diff) | |
| parent | fa55addd23c2f168163175aee17adb125c2c0710 (diff) | |
| download | ffmpeg-8a1c79024da48ef44cc0ba5252ec6fc28e62453b.tar.gz | |
Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'
* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
img2: Drop av_ prefix for a static function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 50352b53b2..0f6f75cfa3 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); } |