summaryrefslogtreecommitdiff
path: root/libavformat/img2dec.c
diff options
context:
space:
mode:
authorVitaliy E Sugrobov <vsugrob@hotmail.com>2012-11-30 12:58:57 +0400
committerPaul B Mahol <onemda@gmail.com>2012-11-30 14:35:11 +0000
commitf83657fcf609e9ac5d290e0a54de2c0d1b818797 (patch)
tree3931fc5a13942b87b8067cdda926d54a97ae8431 /libavformat/img2dec.c
parent5603b2bf6e00f0f7d96448535f9fe6c293308225 (diff)
downloadffmpeg-f83657fcf609e9ac5d290e0a54de2c0d1b818797.tar.gz
Add exception for "gif" in image2 probe() method.
Without this exception files with ".gif" extension by default recognized as input suitable for image2 demuxer rather than gif. In order to pass image through gif demuxer it was necessary to use -f gif option. This change affected 'make fate' test results because previously image2 demuxer and gif decoder took only first frame of multiframe test data, which is no longer true with gif demuxer. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
Diffstat (limited to 'libavformat/img2dec.c')
-rw-r--r--libavformat/img2dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 47c0de32d4..f492bba829 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -181,7 +181,7 @@ static int img_read_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX;
else if (is_glob(p->filename))
return AVPROBE_SCORE_MAX;
- else if(av_match_ext(p->filename, "raw"))
+ else if (av_match_ext(p->filename, "raw") || av_match_ext(p->filename, "gif"))
return 5;
else
return AVPROBE_SCORE_MAX / 2;