diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:30:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:30:19 +0100 |
| commit | 97c8ecaadab4e246d969fadd44072025b64747e4 (patch) | |
| tree | 0261278a3cfd7a66ff9875eb6d5722d68d375477 /libavcodec/h264_mb.c | |
| parent | 2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c (diff) | |
| parent | 56febc993b928ccc039a32158ca60b234c311875 (diff) | |
Merge commit '56febc993b928ccc039a32158ca60b234c311875'
* commit '56febc993b928ccc039a32158ca60b234c311875':
h264: move the slice type variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 45c5695a8e..1dbf9de038 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -528,7 +528,7 @@ static av_always_inline void xchg_mb_border(H264Context *h, H264SliceContext *sl } if (h->deblocking_filter == 2) { - deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == h->slice_num; + deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == sl->slice_num; deblock_top = sl->top_type; } else { deblock_topleft = (h->mb_x > 0); |