diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 15:04:29 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 15:04:29 +0100 |
| commit | ee38234c43b6b3280304be7a43dc569cef683c43 (patch) | |
| tree | d8988b87ec816f608ac38eb18a2d236220a3ac8a /libavcodec/h264_mc_template.c | |
| parent | 79aafd43fd255fc04e4f4db4c45d6d1f5a9b9fff (diff) | |
| parent | e481458bc308ee838deaeacac51929514762e7a7 (diff) | |
Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'
* commit 'e481458bc308ee838deaeacac51929514762e7a7':
h264: factor out pred weight table parsing into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_mc_template.c')
| -rw-r--r-- | libavcodec/h264_mc_template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index e4333a733c..bf8f0ad473 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -48,9 +48,9 @@ static void mc_part(const H264Context *h, H264SliceContext *sl, const h264_biweight_func *weight_avg, int list0, int list1) { - if ((sl->use_weight == 2 && list0 && list1 && - (sl->implicit_weight[sl->ref_cache[0][scan8[n]]][sl->ref_cache[1][scan8[n]]][sl->mb_y & 1] != 32)) || - sl->use_weight == 1) + if ((sl->pwt.use_weight == 2 && list0 && list1 && + (sl->pwt.implicit_weight[sl->ref_cache[0][scan8[n]]][sl->ref_cache[1][scan8[n]]][sl->mb_y & 1] != 32)) || + sl->pwt.use_weight == 1) mc_part_weighted(h, sl, n, square, height, delta, dest_y, dest_cb, dest_cr, x_offset, y_offset, qpix_put, chroma_put, weight_op[0], weight_op[1], weight_avg[0], |