diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:58:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:58:59 +0100 |
| commit | 44e4a86c8afca4ac1f7498ff4419364b839a15f9 (patch) | |
| tree | a06e9c5d2a9a9682615c2ad1bdf49ddb765d65f2 /libavcodec/h264_mb.c | |
| parent | 3d1d8e1f95e1cb6682a6dd035046d91a0812d331 (diff) | |
| parent | c377e04d8aa74d030672e9a4788a700b0695fc14 (diff) | |
Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'
* commit 'c377e04d8aa74d030672e9a4788a700b0695fc14':
h264: move top_borders into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 86fdea9e33..7c08fae756 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -539,8 +539,8 @@ static av_always_inline void xchg_mb_border(const H264Context *h, H264SliceConte src_cb -= uvlinesize + 1 + pixel_shift; src_cr -= uvlinesize + 1 + pixel_shift; - top_border_m1 = h->top_borders[top_idx][sl->mb_x - 1]; - top_border = h->top_borders[top_idx][sl->mb_x]; + top_border_m1 = sl->top_borders[top_idx][sl->mb_x - 1]; + top_border = sl->top_borders[top_idx][sl->mb_x]; #define XCHG(a, b, xchg) \ if (pixel_shift) { \ @@ -563,7 +563,7 @@ static av_always_inline void xchg_mb_border(const H264Context *h, H264SliceConte XCHG(top_border + (0 << pixel_shift), src_y + (1 << pixel_shift), xchg); XCHG(top_border + (8 << pixel_shift), src_y + (9 << pixel_shift), 1); if (sl->mb_x + 1 < h->mb_width) { - XCHG(h->top_borders[top_idx][sl->mb_x + 1], + XCHG(sl->top_borders[top_idx][sl->mb_x + 1], src_y + (17 << pixel_shift), 1); } if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) { @@ -577,8 +577,8 @@ static av_always_inline void xchg_mb_border(const H264Context *h, H264SliceConte XCHG(top_border + (32 << pixel_shift), src_cr + (1 << pixel_shift), xchg); XCHG(top_border + (40 << pixel_shift), src_cr + (9 << pixel_shift), 1); if (sl->mb_x + 1 < h->mb_width) { - XCHG(h->top_borders[top_idx][sl->mb_x + 1] + (16 << pixel_shift), src_cb + (17 << pixel_shift), 1); - XCHG(h->top_borders[top_idx][sl->mb_x + 1] + (32 << pixel_shift), src_cr + (17 << pixel_shift), 1); + XCHG(sl->top_borders[top_idx][sl->mb_x + 1] + (16 << pixel_shift), src_cb + (17 << pixel_shift), 1); + XCHG(sl->top_borders[top_idx][sl->mb_x + 1] + (32 << pixel_shift), src_cr + (17 << pixel_shift), 1); } } else { if (deblock_topleft) { |