From e1c15a9475f030d75c46e57d49e09f121c174c9a Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Tue, 23 Feb 2016 21:37:59 -0500 Subject: 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 --- libavformat/img2dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/img2dec.c') diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index c353563610..a755b6fa60 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -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; -- cgit v1.2.3