diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2016-02-23 21:37:59 -0500 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 14:51:12 +0000 |
| commit | e1c15a9475f030d75c46e57d49e09f121c174c9a (patch) | |
| tree | 0c317ba17bc0dab29cfe23c9092ebecee9156057 /libavformat/img2dec.c | |
| parent | 1f32d01de217fc8314e3b387db77aee628e283cc (diff) | |
| download | ffmpeg-e1c15a9475f030d75c46e57d49e09f121c174c9a.tar.gz | |
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>
Diffstat (limited to 'libavformat/img2dec.c')
| -rw-r--r-- | libavformat/img2dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |