virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

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

Browse Source 
Speeds up next marker search when a SOS marker is found but the frame is
discarded (which happens in avformat_find_stream_info).
This commit is contained in:
Matthieu Bouron 2017-01-28 13:49:52 +01:00
parent 383057f8e7
commit 2ae8278832
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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))