ffmpeg | branch: master | Justin Ruggles <justin.rugg...@gmail.com> | Tue Feb 23 21:37:59 2016 -0500| [e1c15a9475f030d75c46e57d49e09f121c174c9a] | committer: Derek Buitenhuis
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.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1c15a9475f030d75c46e57d49e09f121c174c9a --- 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
