generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: move building the reference list out of h264_slice_header_parse()

Browse Source 
This does not do any bitstream parsing and will allow moving out other
code in later commits.
This commit is contained in:
Anton Khirnov 2016-04-14 20:53:59 +02:00
parent 0bad254300
commit 6dd996c7c8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264_slice.c
View File

@ -1347,9 +1347,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;
@ -1449,6 +1446,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
if (ret < 0) if (ret < 0)
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);