diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:42:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:42:44 +0100 |
| commit | 61635c7a8822d13bc8da69e116f40738be43539a (patch) | |
| tree | 79aacaa9fc966147d4c88d4465034e7eefa5d327 /libavcodec/h264_mb.c | |
| parent | a2740a060b36f6612043fa3128f4eb6197d0ce13 (diff) | |
| parent | 8b00f4df20f4a8ab0656fdaf7d00233a6515a052 (diff) | |
Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'
* commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052':
h264: move some neighbour information into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index db529ec4b8..41ce1329db 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -500,7 +500,8 @@ static av_always_inline void prefetch_motion(H264Context *h, int list, } } -static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y, +static av_always_inline void xchg_mb_border(H264Context *h, H264SliceContext *sl, + uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg, int chroma444, @@ -523,7 +524,7 @@ static av_always_inline void xchg_mb_border(H264Context *h, uint8_t *src_y, if (h->deblocking_filter == 2) { deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == h->slice_num; - deblock_top = h->top_type; + deblock_top = sl->top_type; } else { deblock_topleft = (h->mb_x > 0); deblock_top = (h->mb_y > !!MB_FIELD(h)); |