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 | 95eb35f30513e335990ad0d5dca6ddc318477291 (patch) | |
| tree | 468c7a537fd11445da96dcaddac3736ab5ef28c9 /libavcodec/h264_mb_template.c | |
| parent | 7747726667c86877feed30c9e18460cb8e63f551 (diff) | |
| download | ffmpeg-95eb35f30513e335990ad0d5dca6ddc318477291.tar.gz | |
h264: move the ref lists variables into the per-slice context
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index bca415ee99..7ce72baa00 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -64,7 +64,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) h->vdsp.prefetch(dest_y + (h->mb_x & 3) * 4 * h->linesize + (64 << PIXEL_SHIFT), h->linesize, 4); h->vdsp.prefetch(dest_cb + (h->mb_x & 7) * h->uvlinesize + (64 << PIXEL_SHIFT), dest_cr - dest_cb, 2); - h->list_counts[mb_xy] = h->list_count; + h->list_counts[mb_xy] = sl->list_count; if (!SIMPLE && MB_FIELD(h)) { linesize = sl->mb_linesize = h->linesize * 2; @@ -77,7 +77,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) } if (FRAME_MBAFF(h)) { int list; - for (list = 0; list < h->list_count; list++) { + for (list = 0; list < sl->list_count; list++) { if (!USES_LIST(mb_type, list)) continue; if (IS_16X16(mb_type)) { @@ -292,7 +292,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext h->linesize, 4); } - h->list_counts[mb_xy] = h->list_count; + h->list_counts[mb_xy] = sl->list_count; if (!SIMPLE && MB_FIELD(h)) { linesize = sl->mb_linesize = sl->mb_uvlinesize = h->linesize * 2; @@ -302,7 +302,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext dest[p] -= h->linesize * 15; if (FRAME_MBAFF(h)) { int list; - for (list = 0; list < h->list_count; list++) { + for (list = 0; list < sl->list_count; list++) { if (!USES_LIST(mb_type, list)) continue; if (IS_16X16(mb_type)) { |