diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (patch) | |
| tree | 95ebe3620f648479a9baf11d15b43a34c6800f23 /libavcodec/h264_mb.c | |
| parent | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (diff) | |
| download | ffmpeg-0edbe6faa7ef80daf0e84353cbe733389bf1a522.tar.gz | |
h264: move mb_xy into the per-slice context
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 09d31ecfaf..6410bcb684 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -96,7 +96,7 @@ static inline void get_lowest_part_y(H264Context *h, H264SliceContext *sl, */ static void await_references(H264Context *h, H264SliceContext *sl) { - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; int refs[2][48]; int nrefs[2] = { 0 }; @@ -524,7 +524,7 @@ static av_always_inline void xchg_mb_border(H264Context *h, H264SliceContext *sl } if (sl->deblocking_filter == 2) { - deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == sl->slice_num; + deblock_topleft = h->slice_table[sl->mb_xy - 1 - h->mb_stride] == sl->slice_num; deblock_top = sl->top_type; } else { deblock_topleft = (h->mb_x > 0); @@ -812,7 +812,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, H264SliceCon void ff_h264_hl_decode_mb(H264Context *h, H264SliceContext *sl) { - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; int is_complex = CONFIG_SMALL || sl->is_complex || IS_INTRA_PCM(mb_type) || sl->qscale == 0; |