avisynth: Bump minimum required version to interface version 6

[ffmpeg] / libavformat / yuv4mpegenc.c

diff --git a/libavformat/yuv4mpegenc.c b/libavformat/yuv4mpegenc.c
index ed1ffea87d16fbcf0105150ca47223519a50be15..2caa36490874b1cd5392fcd1238864dca5d8adbb 100644 (file)
--- a/libavformat/yuv4mpegenc.c
+++ b/libavformat/yuv4mpegenc.c
@@ -38,8 +38,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
     width  = st->codec->width;
     height = st->codec->height;
 
-    av_reduce(&raten, &rated, st->codec->time_base.den,
-              st->codec->time_base.num, (1UL << 31) - 1);
+    // TODO: should be avg_frame_rate
+    av_reduce(&raten, &rated, st->time_base.den,
+              st->time_base.num, (1UL << 31) - 1);
 
     aspectn = st->sample_aspect_ratio.num;
     aspectd = st->sample_aspect_ratio.den;
@@ -47,9 +48,11 @@ 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 */
-    if (st->codec->coded_frame && st->codec->coded_frame->interlaced_frame)
-        inter = st->codec->coded_frame->top_field_first ? 't' : 'b';
+    switch (st->codec->field_order) {
+    case AV_FIELD_TT: inter = 't'; break;
+    case AV_FIELD_BB: inter = 'b'; break;
+    default:          inter = 'p'; break;
+    }
 
     switch (st->codec->pix_fmt) {
     case AV_PIX_FMT_GRAY8: