diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:03:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:06:30 +0100 |
| commit | f1436a7f961519f2f149c5eda72af988004f4483 (patch) | |
| tree | 1a9cb91a6f0653ab1399ce6757288b744bb6e370 /libavcodec/h264_mb_template.c | |
| parent | b7e0356cc33297d8db12b56051841f914b6f1ba9 (diff) | |
| parent | e6287f077c3e8e4aca11e61dd4bade1351439e6b (diff) | |
| download | ffmpeg-f1436a7f961519f2f149c5eda72af988004f4483.tar.gz | |
Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'
* commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b':
h264: move {mv,ref}_cache into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 5506e114f2..3403e8500b 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); } } @@ -303,13 +303,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); } } |