From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Wed, 15 Jul 2015 17:41:18 +0000 (+0100)
Subject: ffv1enc: Use input frame to set SAR and interlacing
X-Git-Tag: android-x86-7.1-r1~252^2~2224
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=75c1ed2e4c7250f5e75a11d0140727054ff0136b;p=android-x86%2Fexternal-ffmpeg.git

ffv1enc: Use input frame to set SAR and interlacing
---

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index ad52f155d1..28289fb161 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -863,12 +863,12 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs)
         put_symbol(c, state, f->plane[j].quant_table_index, 0);
         av_assert0(f->plane[j].quant_table_index == f->avctx->context_model);
     }
-    if (!f->avctx->coded_frame->interlaced_frame)
+    if (!f->frame->interlaced_frame)
         put_symbol(c, state, 3, 0);
     else
-        put_symbol(c, state, 1 + !f->avctx->coded_frame->top_field_first, 0);
-    put_symbol(c, state, f->avctx->coded_frame->sample_aspect_ratio.num, 0);
-    put_symbol(c, state, f->avctx->coded_frame->sample_aspect_ratio.den, 0);
+        put_symbol(c, state, 1 + !f->frame->top_field_first, 0);
+    put_symbol(c, state, f->frame->sample_aspect_ratio.num, 0);
+    put_symbol(c, state, f->frame->sample_aspect_ratio.den, 0);
 }
 
 static int encode_slice(AVCodecContext *c, void *arg)