|
|
|
@ -123,10 +123,10 @@ int ff_h264_fill_default_ref_list(H264Context *h){ |
|
|
|
|
for(list= 0; list<2; list++){ |
|
|
|
|
len= add_sorted(sorted , h->short_ref, h->short_ref_count, cur_poc, 1^list); |
|
|
|
|
len+=add_sorted(sorted+len, h->short_ref, h->short_ref_count, cur_poc, 0^list); |
|
|
|
|
assert(len<=32); |
|
|
|
|
av_assert0(len<=32); |
|
|
|
|
len= build_def_list(h->default_ref_list[list] , sorted , len, 0, s->picture_structure); |
|
|
|
|
len+=build_def_list(h->default_ref_list[list]+len, h->long_ref, 16 , 1, s->picture_structure); |
|
|
|
|
assert(len<=32); |
|
|
|
|
av_assert0(len<=32); |
|
|
|
|
|
|
|
|
|
if(len < h->ref_count[list]) |
|
|
|
|
memset(&h->default_ref_list[list][len], 0, sizeof(Picture)*(h->ref_count[list] - len)); |
|
|
|
@ -141,7 +141,7 @@ int ff_h264_fill_default_ref_list(H264Context *h){ |
|
|
|
|
}else{ |
|
|
|
|
len = build_def_list(h->default_ref_list[0] , h->short_ref, h->short_ref_count, 0, s->picture_structure); |
|
|
|
|
len+= build_def_list(h->default_ref_list[0]+len, h-> long_ref, 16 , 1, s->picture_structure); |
|
|
|
|
assert(len <= 32); |
|
|
|
|
av_assert0(len<=32); |
|
|
|
|
if(len < h->ref_count[0]) |
|
|
|
|
memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len)); |
|
|
|
|
} |
|
|
|
|