lavf/img2: Add svg and svgz to allow reading image sequences.

Increase the return value for svg_probe() to make it != AVPROBE_SCORE_EXTENSION.

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 29df4f04e27445f623fa4773e54d18bc23f6844f..8432cc09554db2f9e2b46422e7ae292ca2d20296 100644 (file)
--- 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_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"      },
     { 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 23be1753878e860145c621f8d31b75d920e6f7e7..19cae87fdbe353bdd9aab2b3a38c0d2eb617b2cd 100644 (file)
--- 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"))
 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;
 }
 
     return 0;
 }