Commit ddda2cc4 authored by Alex Agranovsky's avatar Alex Agranovsky Committed by Michael Niedermayer

lavf/mpjpeg: do not include CRLF preceding boundary as part of the returned frame

Signed-off-by: 's avatarAlex Agranovsky <alex@sighthound.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 5edd1f62
...@@ -351,8 +351,8 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -351,8 +351,8 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
do { do {
if (!memcmp(start, mpjpeg->searchstr, mpjpeg->searchstr_len)) { if (!memcmp(start, mpjpeg->searchstr, mpjpeg->searchstr_len)) {
// got the boundary! rewind the stream // got the boundary! rewind the stream
avio_seek(s->pb, -(len-2), SEEK_CUR); avio_seek(s->pb, -len, SEEK_CUR);
pkt->size -= (len-2); pkt->size -= len;
return pkt->size; return pkt->size;
} }
len--; len--;
......
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