]> git.sesse.net Git - ffmpeg/commitdiff
lavf/img2dec: Skip COM when auto-detecting jpeg.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 22 Mar 2016 10:13:24 +0000 (11:13 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 22 Mar 2016 10:13:24 +0000 (11:13 +0100)
It could theoretically contain invalid data that gets ignored by decoders.

libavformat/img2dec.c

index fe0e346d948a4a036db07a062fb341d7ef6a6ee9..686437489703d8d67a82c328268806a725c5529e 100644 (file)
@@ -742,6 +742,7 @@ static int jpeg_probe(AVProbeData *p)
         case APP13:
         case APP14:
         case APP15:
+        case COM:
             i += AV_RB16(&b[i + 2]) + 1;
             break;
         default: