diff options
| author | Johann <johannkoenig@google.com> | 2013-10-29 18:39:24 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-29 18:39:24 -0700 |
| commit | 272d76e3ceed6438b83c666ed7d87f18b85c95e1 (patch) | |
| tree | 4165e04088a51226cd1247cd2e19cc59917c9af2 | |
| parent | d03d960369aaef1e6af39c13a8e9910af9c53469 (diff) | |
| parent | 0f20c839d7f5c6944ce5eac5a391aa441991cd82 (diff) | |
| download | libvpx-272d76e3ceed6438b83c666ed7d87f18b85c95e1.tar libvpx-272d76e3ceed6438b83c666ed7d87f18b85c95e1.tar.gz libvpx-272d76e3ceed6438b83c666ed7d87f18b85c95e1.tar.bz2 libvpx-272d76e3ceed6438b83c666ed7d87f18b85c95e1.zip | |
Merge "decodframe.c: use vpx_memset instead of cast"
| -rw-r--r-- | vp8/decoder/decodframe.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 50ee9c52f..16da78a2c 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -211,7 +211,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, (b->qcoeff[0] * DQC[0], dst, dst_stride, dst, dst_stride); - ((int *)b->qcoeff)[0] = 0; + vpx_memset(b->qcoeff, 0, 2 * sizeof(b->qcoeff[0])); } } } @@ -248,21 +248,14 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, vp8_short_inv_walsh4x4(&b->dqcoeff[0], xd->qcoeff); - ((int *)b->qcoeff)[0] = 0; - ((int *)b->qcoeff)[1] = 0; - ((int *)b->qcoeff)[2] = 0; - ((int *)b->qcoeff)[3] = 0; - ((int *)b->qcoeff)[4] = 0; - ((int *)b->qcoeff)[5] = 0; - ((int *)b->qcoeff)[6] = 0; - ((int *)b->qcoeff)[7] = 0; + vpx_memset(b->qcoeff, 0, 16 * sizeof(b->qcoeff[0])); } else { b->dqcoeff[0] = b->qcoeff[0] * xd->dequant_y2[0]; vp8_short_inv_walsh4x4_1(&b->dqcoeff[0], xd->qcoeff); - ((int *)b->qcoeff)[0] = 0; + vpx_memset(b->qcoeff, 0, 2 * sizeof(b->qcoeff[0])); } /* override the dc dequant constant in order to preserve the |