diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index e4d76f3..8c91bc4 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -43,11 +43,20 @@ static int get_line(AVIOContext *pb, char *line, int line_size)
 static int split_tag_value(char **tag, char **value, char *line)
 {
     char *p = line;
+    int  foundData = 0;
 
-    while (*p != '\0' && *p != ':')
+    *tag = NULL;
+    *value = NULL;
+
+
+    while (*p != '\0' && *p != ':') {
+        if (!av_isspace(*p)) {
+            foundData = 1;
+        }
         p++;
+    }
     if (*p != ':')
-        return AVERROR_INVALIDDATA;
+        return foundData?AVERROR_INVALIDDATA:0;
 
     *p   = '\0';
     *tag = line;
@@ -70,7 +79,9 @@ static int check_content_type(char *line)
     if (ret < 0)
         return ret;
 
-    if (av_strcasecmp(tag, "Content-type") ||
+    if ( tag == NULL ||
+        value == NULL ||
+        av_strcasecmp(tag, "Content-type") ||
         av_strcasecmp(value, "image/jpeg"))
         return AVERROR_INVALIDDATA;
 
@@ -176,6 +187,8 @@ static int parse_multipart_header(AVFormatContext *s)
         ret = split_tag_value(&tag, &value, line);
         if (ret < 0)
             return ret;
+        if (value==NULL || tag==NULL)
+            break;
 
         if (!av_strcasecmp(tag, "Content-type")) {
             if (av_strcasecmp(value, "image/jpeg")) {