[FFmpeg-devel] [PATCH 1/2] img2dec: Support Progressive JPEG in jpeg_probe

Derek Buitenhuis derek.buitenhuis at gmail.com
Wed Feb 24 15:04:14 CET 2016


From: Justin Ruggles <justin.ruggles at gmail.com>

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
 libavformat/img2dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index c353563..a755b6f 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;
-- 
2.7.0



More information about the ffmpeg-devel mailing list