Commit 01bc48f4 authored by Baptiste Coudurier's avatar Baptiste Coudurier

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
parent 364f4a36
...@@ -649,6 +649,9 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -649,6 +649,9 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
s->encoding = 1; s->encoding = 1;
s->progressive_frame=
s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN));
/* init */ /* init */
if (MPV_common_init(s) < 0) if (MPV_common_init(s) < 0)
return -1; return -1;
...@@ -663,8 +666,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -663,8 +666,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
if((CONFIG_H263P_ENCODER || CONFIG_RV20_ENCODER) && s->modified_quant) if((CONFIG_H263P_ENCODER || CONFIG_RV20_ENCODER) && s->modified_quant)
s->chroma_qscale_table= ff_h263_chroma_qscale_table; 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; s->quant_precision=5;
ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment