Browse Source

interlaced dct encoding fix

Originally committed as revision 2592 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 21 years ago
parent
commit
dd5e90cd55
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      libavcodec/mpegvideo.c

+ 5
- 4
libavcodec/mpegvideo.c View File

@@ -678,8 +678,6 @@ int MPV_encode_init(AVCodecContext *avctx)
|| (s->flags&CODEC_FLAG_QP_RD)) || (s->flags&CODEC_FLAG_QP_RD))
&& !s->fixed_qscale; && !s->fixed_qscale;
s->progressive_sequence= !(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
s->obmc= (s->flags & CODEC_FLAG_OBMC); s->obmc= (s->flags & CODEC_FLAG_OBMC);
s->loop_filter= (s->flags & CODEC_FLAG_LOOP_FILTER); 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->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0;
s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0; 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 */ /* /Fx */
/* These are just to be sure */ /* These are just to be sure */
@@ -910,6 +906,11 @@ int MPV_encode_init(AVCodecContext *avctx)
/* init */ /* init */
if (MPV_common_init(s) < 0) if (MPV_common_init(s) < 0)
return -1; 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); ff_init_me(s);




Loading…
Cancel
Save