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 | 4bd5ac200d15b4f458a50f66006549825f9fc865 (patch) | |
| tree | f9ee1ad485e2b388bbe3e9a772744d0383b05825 /libavcodec/h264_mb.c | |
| parent | 5355ed6b20e941430c4f8fb82644e87a65366d61 (diff) | |
| download | ffmpeg-4bd5ac200d15b4f458a50f66006549825f9fc865.tar.gz | |
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 86beb19b37..e26f5c9f70 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -694,7 +694,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, } } } else { - h->hpc.pred16x16[h->intra16x16_pred_mode](dest_y, linesize); + h->hpc.pred16x16[sl->intra16x16_pred_mode](dest_y, linesize); if (is_h264) { if (h->non_zero_count_cache[scan8[LUMA_DC_BLOCK_INDEX + p]]) { if (!transform_bypass) @@ -738,9 +738,9 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, H264SliceCon if (IS_INTRA16x16(mb_type)) { if (transform_bypass) { if (h->sps.profile_idc == 244 && - (h->intra16x16_pred_mode == VERT_PRED8x8 || - h->intra16x16_pred_mode == HOR_PRED8x8)) { - h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, + (sl->intra16x16_pred_mode == VERT_PRED8x8 || + sl->intra16x16_pred_mode == HOR_PRED8x8)) { + h->hpc.pred16x16_add[sl->intra16x16_pred_mode](dest_y, block_offset, h->mb + (p * 256 << pixel_shift), linesize); } else { |