generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74'

Browse Source 
* commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74':
  mpjpeg: Cope with multipart lacking the initial CRLF

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-27 12:55:51 +01:00
commit b95b8e5a22
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mpjpegdec.c
View File

@ -153,10 +153,20 @@ static int parse_multipart_header(AVIOContext *pb, void *log_ctx)
int found_content_type = 0; int found_content_type = 0;
int ret, size = -1; int ret, size = -1;
// get the CRLF as empty string
ret = get_line(pb, line, sizeof(line)); ret = get_line(pb, line, sizeof(line));
if (ret < 0) if (ret < 0)
return ret; return ret;
/* some implementation do not provide the required
* initial CRLF (see rfc1341 7.2.1)
*/
if (!line[0]) {
ret = get_line(pb, line, sizeof(line));
if (ret < 0)
return ret;
}
if (strncmp(line, "--", 2)) if (strncmp(line, "--", 2))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -216,9 +226,6 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) if (ret < 0)
return ret; return ret;
// trailing empty line
avio_skip(s->pb, 2);
return 0; return 0;
} }