diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:58:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:59:16 +0100 |
| commit | 6ec279b54c09f47208930021a38a742f2cc09324 (patch) | |
| tree | c02bfae014bb7a1a3e1706ea8b82d0cc85d2eca0 /libavcodec/h264_mb.c | |
| parent | 20f5be1038fcf9f88d5c74c16c01dd21584405b3 (diff) | |
| parent | 64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e (diff) | |
| download | ffmpeg-streaming-6ec279b54c09f47208930021a38a742f2cc09324.zip ffmpeg-streaming-6ec279b54c09f47208930021a38a742f2cc09324.tar.gz | |
Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
* commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e':
h264: move *_samples_available into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_mb.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 568dd07..419bb48 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -637,12 +637,12 @@ 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 h->hpc.pred8x8l_filter_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), - (h-> topleft_samples_available << i) & 0x8000, - (h->topright_samples_available << i) & 0x4000, linesize); + (sl-> topleft_samples_available << i) & 0x8000, + (sl->topright_samples_available << i) & 0x4000, 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); @@ -670,7 +670,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; av_assert2(h->mb_y || linesize <= block_offset[i]); if (!topright_avail) { if (pixel_shift) { |
