har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mpjpegdec: ensure seekback for latest chunk

Browse Source 
Not only the first, but each latest chunk must be cached to allow
seekback after finding the mime boundary.

Fixes trac #5023 and #5921.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Moritz Barsnick 2019-10-07 00:19:30 +02:00 committed by Michael Niedermayer
parent 1ea44a55fe
commit f76a899abc
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mpjpegdec.c
View File

@ -336,10 +336,8 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->size = 0; pkt->size = 0;
pkt->pos = avio_tell(s->pb); pkt->pos = avio_tell(s->pb);
/* we may need to return as much as all we've read back to the buffer */ while ((ret = ffio_ensure_seekback(s->pb, read_chunk - remaining)) >= 0 && /* we may need to return as much as all we've read back to the buffer */
ffio_ensure_seekback(s->pb, read_chunk); (ret = av_append_packet(s->pb, pkt, read_chunk - remaining)) >= 0) {
while ((ret = av_append_packet(s->pb, pkt, read_chunk - remaining)) >= 0) {
/* scan the new data */ /* scan the new data */
char *start; char *start;