diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:18:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:18:29 +0100 |
| commit | 668c65e7e73a21c86f43ffa1f79bf023fa44cbcd (patch) | |
| tree | 0cb290199a3e87504efbce8519dc80143e902281 /libavcodec/h264_mb.c | |
| parent | db4234c5002fc0ac7ecae323874b97a4547ae0c3 (diff) | |
| parent | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (diff) | |
| download | ffmpeg-668c65e7e73a21c86f43ffa1f79bf023fa44cbcd.tar.gz | |
Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'
* commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522':
h264: move mb_xy into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b50902fc41..9216d213fa 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]; int16_t refs[2][48]; int nrefs[2] = { 0 }; @@ -528,7 +528,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); @@ -817,7 +817,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; |