Mercurial > libavcodec.hg
changeset 1659:3075fc11a974 libavcodec
AVFrame.interlaced_frame fixes
| author | michael |
|---|---|
| date | Fri, 05 Dec 2003 01:03:12 +0000 |
| parents | d4637a0eaab1 |
| children | 806afb8e9085 |
| files | h263.c mpegvideo.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Fri Dec 05 00:19:46 2003 +0000 +++ b/h263.c Fri Dec 05 01:03:12 2003 +0000 @@ -2282,7 +2282,7 @@ } put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */ if(!s->progressive_sequence){ - put_bits(&s->pb, 1, s->top_field_first); + put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first); put_bits(&s->pb, 1, s->alternate_scan); } //FIXME sprite stuff @@ -5252,7 +5252,8 @@ } } - s->progressive_sequence= get_bits1(gb)^1; + s->progressive_sequence= + s->progressive_frame= get_bits1(gb)^1; if(!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO)) av_log(s->avctx, AV_LOG_INFO, "MPEG4 OBMC not supported (very likely buggy encoder)\n"); /* OBMC Disable */ if (vo_ver_id == 1) {
--- a/mpegvideo.c Fri Dec 05 00:19:46 2003 +0000 +++ b/mpegvideo.c Fri Dec 05 01:03:12 2003 +0000 @@ -401,7 +401,9 @@ 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 @@ 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;