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:12 +0100 |
| commit | 64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e (patch) | |
| tree | 29866e0c4f9aaae7d54ffd27a09da81faa53f5fb /libavcodec/h264_mb.c | |
| parent | 7d8154edd594981e7891d57de91f2260f8a62939 (diff) | |
| download | ffmpeg-64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e.tar.gz | |
h264: move *_samples_available 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 7839830234..13640c21cc 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -636,8 +636,8 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, h->hpc.pred8x8l_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize); } else { const int nnz = h->non_zero_count_cache[scan8[i + p * 16]]; - h->hpc.pred8x8l[dir](ptr, (h->topleft_samples_available << i) & 0x8000, - (h->topright_samples_available << i) & 0x4000, linesize); + h->hpc.pred8x8l[dir](ptr, (sl->topleft_samples_available << i) & 0x8000, + (sl->topright_samples_available << i) & 0x4000, linesize); if (nnz) { if (nnz == 1 && dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256)) idct_dc_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize); @@ -665,7 +665,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int nnz, tr; uint64_t tr_high; if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) { - const int topright_avail = (h->topright_samples_available << i) & 0x8000; + const int topright_avail = (sl->topright_samples_available << i) & 0x8000; assert(h->mb_y || linesize <= block_offset[i]); if (!topright_avail) { if (pixel_shift) { |