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 | bf03a878a76dea29b36f368759e9f66102b39a5f (patch) | |
| tree | 4644eed6af1b02ccdba42dab655f3740f0b0fd33 /libavcodec/svq3.c | |
| parent | b063582e0c4f775a8ba377488bd085595e0e7fae (diff) | |
h264: move mb[_{padding,luma_dc}] into the per-slice context
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index e1dbb894fe..95f6051823 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -707,9 +707,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } } if (IS_INTRA16x16(mb_type)) { - AV_ZERO128(h->mb_luma_dc[0] + 0); - AV_ZERO128(h->mb_luma_dc[0] + 8); - if (svq3_decode_block(&h->gb, h->mb_luma_dc[0], 0, 1)) { + AV_ZERO128(sl->mb_luma_dc[0] + 0); + AV_ZERO128(sl->mb_luma_dc[0] + 8); + if (svq3_decode_block(&h->gb, sl->mb_luma_dc[0], 0, 1)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); return -1; @@ -728,7 +728,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) : (4 * i + j); sl->non_zero_count_cache[scan8[k]] = 1; - if (svq3_decode_block(&h->gb, &h->mb[16 * k], index, type)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * k], index, type)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding block\n"); return -1; @@ -738,7 +738,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) if ((cbp & 0x30)) { for (i = 1; i < 3; ++i) - if (svq3_decode_block(&h->gb, &h->mb[16 * 16 * i], 0, 3)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * 16 * i], 0, 3)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); return -1; @@ -750,7 +750,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) k = 16 * i + j; sl->non_zero_count_cache[scan8[k]] = 1; - if (svq3_decode_block(&h->gb, &h->mb[16 * k], 1, 1)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * k], 1, 1)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); return -1; |