Mercurial > libavcodec.hg
changeset 2485:2844b8cf4e11 libavcodec
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
With this patch, the streams CAWP5_TOSHIBA_E.264 and CVWP5_TOSHIBA_E.264
are completely decoded
| author | michael |
|---|---|
| date | Tue, 01 Feb 2005 11:26:11 +0000 |
| parents | a3188eb4266c |
| children | f2a9559db6ac |
| files | h264.c |
| diffstat | 1 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Tue Feb 01 11:12:53 2005 +0000 +++ b/h264.c Tue Feb 01 11:26:11 2005 +0000 @@ -3010,25 +3010,28 @@ else pred+= abs_diff_pic_num; pred &= h->max_pic_num - 1; - for(i= h->ref_count[list]-1; i>=index; i--){ - if(h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0) + for(i= h->ref_count[list]-1; i>=0; i--){ + if(h->ref_list[list][i].data[0] != NULL && h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0) // ignore non existing pictures by testing data[0] pointer break; } }else{ pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx - for(i= h->ref_count[list]-1; i>=index; i--){ - if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1) + for(i= h->ref_count[list]-1; i>=0; i--){ + if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1) // no need to ignore non existing pictures as non existing pictures have long_ref==0 break; } } - if(i < index){ + if (i < 0) { av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME - }else if(i > index){ + } else if (i != index) /* this test is not necessary, it is only an optimisation to skip double copy of Picture structure in this case */ { Picture tmp= h->ref_list[list][i]; - for(; i>index; i--){ + if (i < index) { + i = h->ref_count[list]; + } + for(; i > index; i--){ h->ref_list[list][i]= h->ref_list[list][i-1]; } h->ref_list[list][index]= tmp;