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:13 +0100 |
| commit | e6287f077c3e8e4aca11e61dd4bade1351439e6b (patch) | |
| tree | fe27d754efb718b11606b3c14973ac1c8bde515c /libavcodec/h264_mb_template.c | |
| parent | f69574cf7aca4fe4d57a2155e925f37fc863474d (diff) | |
| download | ffmpeg-e6287f077c3e8e4aca11e61dd4bade1351439e6b.tar.gz | |
h264: move {mv,ref}_cache into the per-slice context
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index fcd17e843c..6235c1136f 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -81,13 +81,13 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) if (!USES_LIST(mb_type, list)) continue; if (IS_16X16(mb_type)) { - int8_t *ref = &h->ref_cache[list][scan8[0]]; + int8_t *ref = &sl->ref_cache[list][scan8[0]]; fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (h->mb_y & 1), 1); } else { for (i = 0; i < 16; i += 4) { - int ref = h->ref_cache[list][scan8[i]]; + int ref = sl->ref_cache[list][scan8[i]]; if (ref >= 0) - fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, + fill_rectangle(&sl->ref_cache[list][scan8[i]], 2, 2, 8, (16 + ref) ^ (h->mb_y & 1), 1); } } @@ -306,13 +306,13 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext if (!USES_LIST(mb_type, list)) continue; if (IS_16X16(mb_type)) { - int8_t *ref = &h->ref_cache[list][scan8[0]]; + int8_t *ref = &sl->ref_cache[list][scan8[0]]; fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (h->mb_y & 1), 1); } else { for (i = 0; i < 16; i += 4) { - int ref = h->ref_cache[list][scan8[i]]; + int ref = sl->ref_cache[list][scan8[i]]; if (ref >= 0) - fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, + fill_rectangle(&sl->ref_cache[list][scan8[i]], 2, 2, 8, (16 + ref) ^ (h->mb_y & 1), 1); } } |