[FFmpeg-cvslog] avformat/mpjpegdec: Allow mpjpeg headers parsing to succeed upon EOF, if required headers are present

Alex Agranovsky git at videolan.org
Sun Sep 13 03:22:38 CEST 2015


ffmpeg | branch: master | Alex Agranovsky <alex at sighthound.com> | Sat Sep 12 20:34:14 2015 -0400| [276ab7c148b98ac44017ff39a8e525a1516a440e] | committer: Michael Niedermayer

avformat/mpjpegdec: Allow mpjpeg headers parsing to succeed upon EOF, if required headers are present

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=276ab7c148b98ac44017ff39a8e525a1516a440e
---

 libavformat/mpjpegdec.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index b8281fc..b94d088 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -164,8 +164,11 @@ static int parse_multipart_header(AVFormatContext *s)
         char *tag, *value;
 
         ret = get_line(s->pb, line, sizeof(line));
-        if (ret < 0)
+        if (ret < 0) {
+            if (ret==AVERROR_EOF)
+                break;
             return ret;
+        }
 
         if (line[0] == '\0')
             break;



More information about the ffmpeg-cvslog mailing list