mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '89ae244e78a8d636fbb8427a2da052b04cf710bd'
* commit '89ae244e78a8d636fbb8427a2da052b04cf710bd': h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list() Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
d5cfe23324
|
@ -731,7 +731,7 @@ int ff_h264_get_slice_type(const H264SliceContext *sl);
|
|||
int ff_h264_alloc_tables(H264Context *h);
|
||||
|
||||
int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl);
|
||||
void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl);
|
||||
void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl);
|
||||
void ff_h264_remove_all_refs(H264Context *h);
|
||||
|
||||
/**
|
||||
|
|
|
@ -401,7 +401,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl)
|
||||
void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl)
|
||||
{
|
||||
int list, i, j;
|
||||
for (list = 0; list < sl->list_count; list++) {
|
||||
|
|
|
@ -1680,7 +1680,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
|
|||
}
|
||||
|
||||
if (FRAME_MBAFF(h)) {
|
||||
ff_h264_fill_mbaff_ref_list(h, sl);
|
||||
ff_h264_fill_mbaff_ref_list(sl);
|
||||
|
||||
if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) {
|
||||
implicit_weight_table(h, sl, 0);
|
||||
|
|
Loading…
Reference in New Issue