summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2017-05-22 01:09:21 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2017-05-22 01:09:21 +0200
commit7f60dc03a0b88de78298bb57834d9fbc68926b64 (patch)
treeb34ac3710ee55ec108b6b6a07f188e7e89f0da3b
parent017a68e8fb8b146eda89b7678e754c4bdaba6f10 (diff)
lavf/img2: Add svg and svgz to allow reading image sequences.
Increase the return value for svg_probe() to make it != AVPROBE_SCORE_EXTENSION.
-rw-r--r--libavformat/img2.c2
-rw-r--r--libavformat/img2dec.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 29df4f04e2..8432cc0955 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -65,6 +65,8 @@ const IdStrMap ff_img_tags[] = {
{ AV_CODEC_ID_SUNRAST, "im24" },
{ AV_CODEC_ID_SUNRAST, "im32" },
{ AV_CODEC_ID_SUNRAST, "sunras" },
+ { AV_CODEC_ID_SVG, "svg" },
+ { AV_CODEC_ID_SVG, "svgz" },
{ AV_CODEC_ID_JPEG2000, "j2c" },
{ AV_CODEC_ID_JPEG2000, "jp2" },
{ AV_CODEC_ID_JPEG2000, "jpc" },
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 23be175387..19cae87fdb 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -876,7 +876,7 @@ static int sunrast_probe(AVProbeData *p)
static int svg_probe(AVProbeData *p)
{
if (av_match_ext(p->filename, "svg") || av_match_ext(p->filename, "svgz"))
- return AVPROBE_SCORE_EXTENSION;
+ return AVPROBE_SCORE_EXTENSION + 1;
return 0;
}