diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 17:42:06 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 17:42:06 +0200 |
| commit | 9ab6f01839e3c0c025237ebf839ce8525c8d67d9 (patch) | |
| tree | fa3c1d54df29fbd5f3a62685eadfa6f29abe06f0 | |
| parent | 3b95452ca8bb39ac2136c9212a80b921e37f18c8 (diff) | |
| parent | 6dd996c7c81575a1e4969987ab175a6df7beab3d (diff) | |
| download | ffmpeg-9ab6f01839e3c0c025237ebf839ce8525c8d67d9.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h264_slice.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 49ed0d04a6..e07f8666b0 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); |