diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-29 11:16:39 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-29 11:16:39 -0700 |
| commit | e14f900ae31affcfdd8380ef5f53b199d3f94b8f (patch) | |
| tree | 4db58b8d850db1efb76a37b6cb71865879f35f16 /vp9/encoder/vp9_encodemb.c | |
| parent | 2e6040dacafbee2f847009426269ad332930c923 (diff) | |
| parent | 35a83677a534f3e100eb118ea85eeedb495bc621 (diff) | |
| download | libvpx-e14f900ae31affcfdd8380ef5f53b199d3f94b8f.tar libvpx-e14f900ae31affcfdd8380ef5f53b199d3f94b8f.tar.gz libvpx-e14f900ae31affcfdd8380ef5f53b199d3f94b8f.tar.bz2 libvpx-e14f900ae31affcfdd8380ef5f53b199d3f94b8f.zip | |
Merge "Moving itxm_add pointer from MACROBLOCKD to MACROBLOCK."
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 3b231b7f2..8581e6117 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -406,7 +406,7 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize, // this is like vp9_short_idct4x4 but has a special case around eob<=1 // which is significant (not just an optimization) for the lossless // case. - xd->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]); + x->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]); break; default: assert(0 && "Invalid transform size"); @@ -428,7 +428,7 @@ static void encode_block_pass1(int plane, int block, BLOCK_SIZE plane_bsize, vp9_xform_quant(x, plane, block, plane_bsize, tx_size); if (p->eobs[block] > 0) - xd->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]); + x->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]); } void vp9_encode_sby_pass1(MACROBLOCK *x, BLOCK_SIZE bsize) { @@ -574,7 +574,7 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, // this is like vp9_short_idct4x4 but has a special case around eob<=1 // which is significant (not just an optimization) for the lossless // case. - xd->itxm_add(dqcoeff, dst, dst_stride, *eob); + x->itxm_add(dqcoeff, dst, dst_stride, *eob); else vp9_iht4x4_16_add(dqcoeff, dst, dst_stride, tx_type); } |