aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-12-05 01:03:12 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-12-05 01:03:12 +0000
commit2be9f03abb2be775f4882fb87fb735bd7b5a3930 (patch)
tree578a2f7578c4d424d0a29283fa7769814feb3378 /libavcodec/mpegvideo.c
parent647b77627056024e53d0beb5ac3d57ed3c670a9e (diff)
downloadffmpeg-2be9f03abb2be775f4882fb87fb735bd7b5a3930.tar.gz
AVFrame.interlaced_frame fixes
Originally committed as revision 2566 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r--libavcodec/mpegvideo.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ef682e4838..d686dec216 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -401,7 +401,9 @@ int MPV_common_init(MpegEncContext *s)
s->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
- s->chroma_qscale_table= ff_default_chroma_qscale_table;
+ s->chroma_qscale_table= ff_default_chroma_qscale_table;
+ s->progressive_sequence=
+ s->progressive_frame= 1;
y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2);
c_size = (s->mb_width + 2) * (s->mb_height + 2);
@@ -1152,7 +1154,7 @@ alloc:
s->current_picture_ptr= (Picture*)pic;
s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic
- s->current_picture_ptr->interlaced_frame= !s->progressive_frame;
+ s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence;
}
s->current_picture_ptr->pict_type= s->pict_type;