diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpjpegdec.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index d4b200e9c5..2749a48ace 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -153,10 +153,20 @@ static int parse_multipart_header(AVIOContext *pb, void *log_ctx) int found_content_type = 0; int ret, size = -1; + // get the CRLF as empty string ret = get_line(pb, line, sizeof(line)); if (ret < 0) 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)) return AVERROR_INVALIDDATA; @@ -216,9 +226,6 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; - // trailing empty line - avio_skip(s->pb, 2); - return 0; } |