ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Wed Jun 29 17:42:06 2016 +0200| [9ab6f01839e3c0c025237ebf839ce8525c8d67d9] | committer: Clément Bœsch
Merge commit '6dd996c7c81575a1e4969987ab175a6df7beab3d' * commit '6dd996c7c81575a1e4969987ab175a6df7beab3d': h264: move building the reference list out of h264_slice_header_parse() Merged-by: Clément Bœsch <clem...@stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ab6f01839e3c0c025237ebf839ce8525c8d67d9 --- libavcodec/h264_slice.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 49ed0d0..e07f866 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -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); ====================================================================== diff --cc libavcodec/h264_slice.c index 49ed0d0,0c38121..e07f866 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@@ -1696,9 -1443,13 +1693,13 @@@ int ff_h264_decode_slice_header(H264Con int i, j, ret = 0; ret = h264_slice_header_parse(h, sl); - if (ret < 0) + 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
