From dd5e90cd558f428f8897f43ba95cf722614898be Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 10 Dec 2003 17:05:41 +0000
Subject: [PATCH] interlaced dct encoding fix
Originally committed as revision 2592 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mpegvideo.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ddd28bb9c85..631262d7bcf 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -678,8 +678,6 @@ int MPV_encode_init(AVCodecContext *avctx)
|| (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 @@ int MPV_encode_init(AVCodecContext *avctx)
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 @@ int MPV_encode_init(AVCodecContext *avctx)
/* 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);
--
GitLab