Mercurial > libavcodec.hg
changeset 7382:f9e70983fc35 libavcodec
Set field_poc (it was half uninitialized before) and use it
instead of the fragile first_field check to determine if we have
2 fields at the end.
| author | michael |
|---|---|
| date | Thu, 24 Jul 2008 23:43:44 +0000 |
| parents | 16a60b2f7a7d |
| children | c4e5f2158b20 |
| files | h264.c |
| diffstat | 1 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Thu Jul 24 22:29:38 2008 +0000 +++ b/h264.c Thu Jul 24 23:43:44 2008 +0000 @@ -2264,6 +2264,10 @@ // mark frames as reference later "naturally". if(s->codec_id != CODEC_ID_SVQ3) s->current_picture_ptr->reference= 0; + + s->current_picture_ptr->field_poc[0]= + s->current_picture_ptr->field_poc[1]= INT_MAX; + return 0; } @@ -3698,6 +3702,7 @@ MpegEncContext * const s = &h->s; const int max_frame_num= 1<<h->sps.log2_max_frame_num; int field_poc[2]; + Picture *cur = s->current_picture_ptr; h->frame_num_offset= h->prev_frame_num_offset; if(h->frame_num < h->prev_frame_num) @@ -3761,18 +3766,11 @@ field_poc[1]= poc; } - if(s->picture_structure != PICT_BOTTOM_FIELD) { + if(s->picture_structure != PICT_BOTTOM_FIELD) s->current_picture_ptr->field_poc[0]= field_poc[0]; - s->current_picture_ptr->poc = field_poc[0]; - } - if(s->picture_structure != PICT_TOP_FIELD) { + if(s->picture_structure != PICT_TOP_FIELD) s->current_picture_ptr->field_poc[1]= field_poc[1]; - s->current_picture_ptr->poc = field_poc[1]; - } - if(!FIELD_PICTURE || !s->first_field) { - Picture *cur = s->current_picture_ptr; - cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]); - } + cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]); return 0; } @@ -7877,7 +7875,7 @@ MPV_frame_end(s); - if (s->first_field) { + if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) { /* Wait for second field. */ *data_size = 0;