diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-02-21 15:49:41 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-02-21 20:17:56 +0100 |
| commit | 3f486e0dae13e92399c988054aa073c460dbb206 (patch) | |
| tree | d10dfddd2ec0445a80bf117be1dbd35ba9077e17 | |
| parent | 24d150b77361b369b4d9105714df378e2ac1888c (diff) | |
| download | ffmpeg-3f486e0dae13e92399c988054aa073c460dbb206.tar.gz | |
img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
| -rw-r--r-- | libavformat/img2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index d7a749cde5..4c43e4406e 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -129,6 +129,11 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str) return CODEC_ID_NONE; } +enum CodecID ff_guess_image2_codec(const char *filename) +{ + return av_str2id(img_tags, filename); +} + /* return -1 if no image found */ static int find_image_range(int *pfirst_index, int *plast_index, const char *path) @@ -185,7 +190,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, static int read_probe(AVProbeData *p) { - if (p->filename && av_str2id(img_tags, p->filename)) { + if (p->filename && ff_guess_image2_codec(p->filename)) { if (av_filename_number_test(p->filename)) return AVPROBE_SCORE_MAX; else @@ -194,11 +199,6 @@ static int read_probe(AVProbeData *p) return 0; } -enum CodecID ff_guess_image2_codec(const char *filename) -{ - return av_str2id(img_tags, filename); -} - static int read_header(AVFormatContext *s1) { VideoData *s = s1->priv_data; @@ -266,7 +266,7 @@ static int read_header(AVFormatContext *s1) st->codec->codec_id = s1->audio_codec_id; }else{ st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = av_str2id(img_tags, s->path); + st->codec->codec_id = ff_guess_image2_codec(s->path); } if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO && pix_fmt != PIX_FMT_NONE) st->codec->pix_fmt = pix_fmt; @@ -403,7 +403,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) avio_close(pb[1]); avio_close(pb[2]); }else{ - if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){ + if (ff_guess_image2_codec(s->filename) == CODEC_ID_JPEG2000) { AVStream *st = s->streams[0]; if(st->codec->extradata_size > 8 && AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){ |