X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fimg2dec.c;h=a920f4611f46641cba9762f585318552f9f00129;hb=6ede4e93ca0468dc1645677ad540f575c941ff7a;hp=9d6796ff3e90c4cc5a5dd57417f4b69bd15a0e96;hpb=2c138b2c9b0ec92d9baf704498b1a32a989d03c5;p=ffmpeg diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 9d6796ff3e9..a920f4611f4 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -726,6 +726,7 @@ static int jpeg_probe(AVProbeData *p) return 0; state = EOI; break; + case DQT: case APP0: case APP1: case APP2: @@ -773,7 +774,7 @@ static int pcx_probe(AVProbeData *p) if ( p->buf_size < 128 || b[0] != 10 || b[1] > 5 - || b[2] != 1 + || b[2] > 1 || av_popcount(b[3]) != 1 || b[3] > 8 || AV_RL16(&b[4]) > AV_RL16(&b[8]) || AV_RL16(&b[6]) > AV_RL16(&b[10])