Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'

* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
  yuv4mpegdec: do not set coded_frame properties

Conflicts:
	libavformat/yuv4mpegdec.c

See: b45a3e167f497d82effbf8ada453ea47b0ee21da
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/yuv4mpegdec.c
index 120630f78a0eb2005b032c528dad7f8ff112542b,e5c4456ed7348b992523b1ce2125fd36119fda5e..c02b2911bc17fb75418d867d6f773176dde706b1
--- 1/libavformat/yuv4mpegdec.c
--- 2/libavformat/yuv4mpegdec.c
+++ b/libavformat/yuv4mpegdec.c
@@@ -134,7 -103,27 +135,26 @@@ static int yuv4_read_header(AVFormatCon
                  tokstart++;
              break;
          case 'I': // Interlace type
-             interlaced = *tokstart++;
+             switch (*tokstart++){
+             case '?':
+                 field_order = AV_FIELD_UNKNOWN;
+                 break;
+             case 'p':
+                 field_order = AV_FIELD_PROGRESSIVE;
+                 break;
+             case 't':
+                 field_order = AV_FIELD_TT;
+                 break;
+             case 'b':
+                 field_order = AV_FIELD_BB;
+                 break;
+             case 'm':
+                 av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains mixed "
+                        "interlaced and non-interlaced frames.\n");
 -                return -1;
+             default:
+                 av_log(s, AV_LOG_ERROR, "YUV4MPEG has invalid header.\n");
 -                return -1;
++                return AVERROR(EINVAL);
+             }
              break;
          case 'F': // Frame rate
              sscanf(tokstart, "%d:%d", &raten, &rated); // 0:0 if unknown