Commit 2ae82788 authored by Matthieu Bouron's avatar Matthieu Bouron

lavc/mjpegdec: consume SOS data even if the frame is discarded

Speeds up next marker search when a SOS marker is found but the frame is
discarded (which happens in avformat_find_stream_info).
parent 383057f8
......@@ -2247,8 +2247,10 @@ eoi_parser:
goto the_end;
case SOS:
s->cur_scan++;
if (avctx->skip_frame == AVDISCARD_ALL)
if (avctx->skip_frame == AVDISCARD_ALL) {
skip_bits(&s->gb, get_bits_left(&s->gb));
break;
}
if ((ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL)) < 0 &&
(avctx->err_recognition & AV_EF_EXPLODE))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment