diff options
| author | Adrian Grange <agrange@google.com> | 2015-03-26 16:31:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-26 16:31:27 -0700 |
| commit | 553792cee2eaed4872c321b41d3a4bad0823afc4 (patch) | |
| tree | fe3497eb3b150ac32811faefc799b41ff69f8e3e | |
| parent | 300d428ecd0d578b31c91e593808380ef1ef61aa (diff) | |
| parent | ad18b2b641fe74a3e4baec34918b943233fc6714 (diff) | |
| download | libvpx-553792cee2eaed4872c321b41d3a4bad0823afc4.tar libvpx-553792cee2eaed4872c321b41d3a4bad0823afc4.tar.gz libvpx-553792cee2eaed4872c321b41d3a4bad0823afc4.tar.bz2 libvpx-553792cee2eaed4872c321b41d3a4bad0823afc4.zip | |
Merge "Remove 8-bit array in HBD"
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 5fef9f89b..e8c3f767e 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2410,7 +2410,6 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, int_mv cur_mv[2]; #if CONFIG_VP9_HIGHBITDEPTH DECLARE_ALIGNED_ARRAY(16, uint16_t, tmp_buf16, MAX_MB_PLANE * 64 * 64); - DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf8, MAX_MB_PLANE * 64 * 64); uint8_t *tmp_buf; #else DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf, MAX_MB_PLANE * 64 * 64); @@ -2439,7 +2438,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { tmp_buf = CONVERT_TO_BYTEPTR(tmp_buf16); } else { - tmp_buf = tmp_buf8; + tmp_buf = (uint8_t *)tmp_buf16; } #endif // CONFIG_VP9_HIGHBITDEPTH |