1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00

img2dec: Support Progressive JPEG in jpeg_probe

There can be multiple SOS markers, so do not return 0 in that case.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Justin Ruggles 2016-02-23 21:37:59 -05:00 committed by Derek Buitenhuis
parent 1f32d01de2
commit e1c15a9475

View File

@ -714,7 +714,7 @@ static int jpeg_probe(AVProbeData *p)
state = 0xC0;
break;
case 0xDA:
if (state != 0xC0)
if (state != 0xC0 && state != 0xDA)
return 0;
state = 0xDA;
break;