[FFmpeg-cvslog] r18905 - trunk/libavcodec/mpegvideo_enc.c

[bcoudurier]

Author: bcoudurier
Date: Sat May 23 03:22:43 2009
New Revision: 18905

Log:
Set progressive_sequence before MPV_common_init which cares about it when
setting mb_height for interlaced mpeg-2 encoding.

Modified:
   trunk/libavcodec/mpegvideo_enc.c

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Sat May 23 03:20:42 2009	(r18904)
+++ trunk/libavcodec/mpegvideo_enc.c	Sat May 23 03:22:43 2009	(r18905)
@@ -649,6 +649,9 @@ av_cold int MPV_encode_init(AVCodecConte
 
     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(AVCodecConte
 
     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);