diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:38 +0100 |
| commit | a2740a060b36f6612043fa3128f4eb6197d0ce13 (patch) | |
| tree | f8420993f59d3f5e6fc1a3284862aea4ae6cac3d /libavcodec/h264_mb.c | |
| parent | c07b7e483af6a0bee49c0ac46030d9b10be4913b (diff) | |
| parent | 4bd5ac200d15b4f458a50f66006549825f9fc865 (diff) | |
Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'
* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 2a6bd8a485..db529ec4b8 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -699,7 +699,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) @@ -743,9 +743,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 { |