From 01bc48f4d526c10900df44a97468059f69ef0761 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 23 May 2009 01:22:43 +0000 Subject: [PATCH] Set progressive_sequence before MPV_common_init which cares about it when setting mb_height for interlaced mpeg-2 encoding. Originally committed as revision 18905 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo_enc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ec291bf..f1dcff4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -649,6 +649,9 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) s->encoding = 1; + s->progressive_frame= + s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN)); + /* init */ if (MPV_common_init(s) < 0) return -1; @@ -663,8 +666,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) if((CONFIG_H263P_ENCODER || CONFIG_RV20_ENCODER) && s->modified_quant) s->chroma_qscale_table= ff_h263_chroma_qscale_table; - s->progressive_frame= - s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN)); + s->quant_precision=5; ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); -- 2.7.4