summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-03-22 11:13:24 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-03-22 11:13:24 +0100
commitef888de1c1d2581d45c1917d8f9081b35ea07a72 (patch)
treea9b44f40ca3d56b41c7f86bc49911912717c6e73
parent14478b6c3820339442d8c96b701d021499de0827 (diff)
lavf/img2dec: Skip COM when auto-detecting jpeg.
It could theoretically contain invalid data that gets ignored by decoders.
-rw-r--r--libavformat/img2dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index fe0e346d94..6864374897 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -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: