Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:
	libavformat/yuv4mpegenc.c

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

libavformat/yuv4mpegenc.c

@@ -48,15 +48,12 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
     if (aspectn == 0 && aspectd == 1)
         aspectd = 0;  // 0:0 means unknown
 
-    inter = 'p'; /* progressive is the default */
+    switch (st->codec->field_order) {
-    if (st->codec->coded_frame && st->codec->coded_frame->interlaced_frame)
+    case AV_FIELD_TB:
-        inter = st->codec->coded_frame->top_field_first ? 't' : 'b';
+    case AV_FIELD_TT: inter = 't'; break;
-    if (st->codec->field_order == AV_FIELD_PROGRESSIVE) {
+    case AV_FIELD_BT:
-        inter = 'p';
+    case AV_FIELD_BB: inter = 'b'; break;
-    } else if (st->codec->field_order == AV_FIELD_TB || st->codec->field_order == AV_FIELD_TT) {
+    default:          inter = 'p'; break;
-        inter = 't';
-    } else if (st->codec->field_order == AV_FIELD_BT || st->codec->field_order == AV_FIELD_BB) {
-        inter = 'b';
     }
 
     switch (st->codec->pix_fmt) {