Mercurial > libavcodec.hg
comparison mpegvideo.c @ 1659:3075fc11a974 libavcodec
AVFrame.interlaced_frame fixes
| author | michael |
|---|---|
| date | Fri, 05 Dec 2003 01:03:12 +0000 |
| parents | d4637a0eaab1 |
| children | 4c9fd29f1606 |
comparison
equal
deleted
inserted
replaced
| 1658:d4637a0eaab1 | 1659:3075fc11a974 |
|---|---|
| 399 s->block_wrap[4]= | 399 s->block_wrap[4]= |
| 400 s->block_wrap[5]= s->mb_width + 2; | 400 s->block_wrap[5]= s->mb_width + 2; |
| 401 | 401 |
| 402 s->y_dc_scale_table= | 402 s->y_dc_scale_table= |
| 403 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | 403 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; |
| 404 s->chroma_qscale_table= ff_default_chroma_qscale_table; | 404 s->chroma_qscale_table= ff_default_chroma_qscale_table; |
| 405 s->progressive_sequence= | |
| 406 s->progressive_frame= 1; | |
| 405 | 407 |
| 406 y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); | 408 y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); |
| 407 c_size = (s->mb_width + 2) * (s->mb_height + 2); | 409 c_size = (s->mb_width + 2) * (s->mb_height + 2); |
| 408 yc_size = y_size + 2 * c_size; | 410 yc_size = y_size + 2 * c_size; |
| 409 | 411 |
| 1150 if( alloc_picture(s, (Picture*)pic, 0) < 0) | 1152 if( alloc_picture(s, (Picture*)pic, 0) < 0) |
| 1151 return -1; | 1153 return -1; |
| 1152 | 1154 |
| 1153 s->current_picture_ptr= (Picture*)pic; | 1155 s->current_picture_ptr= (Picture*)pic; |
| 1154 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic | 1156 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic |
| 1155 s->current_picture_ptr->interlaced_frame= !s->progressive_frame; | 1157 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence; |
| 1156 } | 1158 } |
| 1157 | 1159 |
| 1158 s->current_picture_ptr->pict_type= s->pict_type; | 1160 s->current_picture_ptr->pict_type= s->pict_type; |
| 1159 // if(s->flags && CODEC_FLAG_QSCALE) | 1161 // if(s->flags && CODEC_FLAG_QSCALE) |
| 1160 // s->current_picture_ptr->quality= s->new_picture_ptr->quality; | 1162 // s->current_picture_ptr->quality= s->new_picture_ptr->quality; |