Commit 9ab6f018 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit '6dd996c7'

* commit '6dd996c7':
  h264: move building the reference list out of h264_slice_header_parse()
Merged-by: 's avatarClément Bœsch <clement@stupeflix.com>
parents 3b95452c 6dd996c7
...@@ -1597,9 +1597,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) ...@@ -1597,9 +1597,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl)
sl->ref_count[1] = sl->ref_count[0] = 0; sl->ref_count[1] = sl->ref_count[0] = 0;
return ret; return ret;
} }
ret = ff_h264_build_ref_list(h, sl);
if (ret < 0)
return ret;
} }
sl->pwt.use_weight = 0; sl->pwt.use_weight = 0;
...@@ -1699,6 +1696,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) ...@@ -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, ... if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ...
return ret; return ret;
ret = ff_h264_build_ref_list(h, sl);
if (ret < 0)
return ret;
if (h->ps.pps->weighted_bipred_idc == 2 && if (h->ps.pps->weighted_bipred_idc == 2 &&
sl->slice_type_nos == AV_PICTURE_TYPE_B) { sl->slice_type_nos == AV_PICTURE_TYPE_B) {
implicit_weight_table(h, sl, -1); implicit_weight_table(h, sl, -1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment