changeset 1678:c962b8db3715 libavcodec

interlaced dct encoding fix
author michael
date Wed, 10 Dec 2003 17:05:41 +0000
parents c8b1b515d3b9
children 55c03fa692a9
files mpegvideo.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo.c	Wed Dec 10 16:51:54 2003 +0000
+++ b/mpegvideo.c	Wed Dec 10 17:05:41 2003 +0000
@@ -678,8 +678,6 @@
                         || (s->flags&CODEC_FLAG_QP_RD))
                        && !s->fixed_qscale;
     
-    s->progressive_sequence= !(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
-    
     s->obmc= (s->flags & CODEC_FLAG_OBMC);
     s->loop_filter= (s->flags & CODEC_FLAG_LOOP_FILTER);
 
@@ -802,8 +800,6 @@
 	s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0;
 	s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
         s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0;
-        if(s->modified_quant)
-            s->chroma_qscale_table= ff_h263_chroma_qscale_table;
 
 	/* /Fx */
         /* These are just to be sure */
@@ -910,6 +906,11 @@
     /* init */
     if (MPV_common_init(s) < 0)
         return -1;
+
+    if(s->modified_quant)
+        s->chroma_qscale_table= ff_h263_chroma_qscale_table;
+    s->progressive_frame= 
+    s->progressive_sequence= !(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
     
     ff_init_me(s);