mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
Merge commit '6dd996c7c81575a1e4969987ab175a6df7beab3d'
* commit '6dd996c7c81575a1e4969987ab175a6df7beab3d': h264: move building the reference list out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
commit
9ab6f01839
@ -1597,9 +1597,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl)
|
||||
sl->ref_count[1] = sl->ref_count[0] = 0;
|
||||
return ret;
|
||||
}
|
||||
ret = ff_h264_build_ref_list(h, sl);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
sl->pwt.use_weight = 0;
|
||||
@ -1699,6 +1696,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
|
||||
if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ...
|
||||
return ret;
|
||||
|
||||
ret = ff_h264_build_ref_list(h, sl);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (h->ps.pps->weighted_bipred_idc == 2 &&
|
||||
sl->slice_type_nos == AV_PICTURE_TYPE_B) {
|
||||
implicit_weight_table(h, sl, -1);
|
||||
|
Loading…
Reference in New Issue
Block a user