Browse Source

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).
tags/n3.3
Matthieu Bouron 8 years ago
parent
commit
2ae8278832
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/mjpegdec.c

+ 3
- 1
libavcodec/mjpegdec.c View File

@@ -2247,8 +2247,10 @@ eoi_parser:
goto the_end; goto the_end;
case SOS: case SOS:
s->cur_scan++; 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; break;
}


if ((ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL)) < 0 && if ((ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL)) < 0 &&
(avctx->err_recognition & AV_EF_EXPLODE)) (avctx->err_recognition & AV_EF_EXPLODE))


Loading…
Cancel
Save