diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:25:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:46:15 +0100 |
| commit | d76559fb5f529db5f14d304936cadebce902b68c (patch) | |
| tree | cc7c6a35be33afc181a7a03749fdab72b693cd0c /libavcodec/h264_mc_template.c | |
| parent | 668c65e7e73a21c86f43ffa1f79bf023fa44cbcd (diff) | |
| parent | d4d9068cdf8f4b2b87ae87a2ef880d243f77b977 (diff) | |
Merge commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977'
* commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977':
h264: move mb_{x,y} into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mc_template.c')
| -rw-r--r-- | libavcodec/h264_mc_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index 2ca82a321d..e9f6ed5002 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -49,7 +49,7 @@ static void mc_part(H264Context *h, H264SliceContext *sl, 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]]][h->mb_y & 1] != 32)) || + (sl->implicit_weight[sl->ref_cache[0][scan8[n]]][sl->ref_cache[1][scan8[n]]][sl->mb_y & 1] != 32)) || sl->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, |