diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:44:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:44:38 +0100 |
| commit | 6abd1e901c065280d50adbbf95eb54773870328c (patch) | |
| tree | 69ff8bd6a5d99e25696cf21bdb05a8b3016ffa59 /libavcodec/h264_mb.c | |
| parent | 61635c7a8822d13bc8da69e116f40738be43539a (diff) | |
| parent | 7d8154edd594981e7891d57de91f2260f8a62939 (diff) | |
| download | ffmpeg-6abd1e901c065280d50adbbf95eb54773870328c.tar.gz | |
Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
* commit '7d8154edd594981e7891d57de91f2260f8a62939':
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 41ce1329db..568dd07c20 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -631,7 +631,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, } for (i = 0; i < 16; i += 4) { uint8_t *const ptr = dest_y + block_offset[i]; - const int dir = h->intra4x4_pred_mode_cache[scan8[i]]; + const int dir = sl->intra4x4_pred_mode_cache[scan8[i]]; if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) { if (h->x264_build != -1) { h->hpc.pred8x8l_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize); @@ -661,7 +661,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, } for (i = 0; i < 16; i++) { uint8_t *const ptr = dest_y + block_offset[i]; - const int dir = h->intra4x4_pred_mode_cache[scan8[i]]; + const int dir = sl->intra4x4_pred_mode_cache[scan8[i]]; if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) { h->hpc.pred4x4_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize); |