diff options
| author | Linfeng Zhang <linfengz@google.com> | 2017-04-19 23:55:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-19 23:55:58 +0000 |
| commit | fbbdba3b0498bc640c5532230ca3087deee68d5e (patch) | |
| tree | e038e9fa54350a7f4acc8de14b5159f3ae0136bf /vp9/common | |
| parent | 977356a72ba55c56e256411f75c144b5c22a2d6d (diff) | |
| parent | bf8a49abbd3e637ae933806aa47564dd7ef324d1 (diff) | |
| download | libvpx-fbbdba3b0498bc640c5532230ca3087deee68d5e.tar libvpx-fbbdba3b0498bc640c5532230ca3087deee68d5e.tar.gz libvpx-fbbdba3b0498bc640c5532230ca3087deee68d5e.tar.bz2 libvpx-fbbdba3b0498bc640c5532230ca3087deee68d5e.zip | |
Merge changes I9e18a73b,Ie47c8cd4
* changes:
Clean CONVERT_TO_BYTEPTR/SHORTPTR in convolve
Create CAST_TO_BYTEPTR/SHORTPTR
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_reconinter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 4fed4f7f6..cb7d1c63a 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -37,8 +37,9 @@ static INLINE void highbd_inter_predictor( const int subpel_x, const int subpel_y, const struct scale_factors *sf, int w, int h, int ref, const InterpKernel *kernel, int xs, int ys, int bd) { sf->highbd_predict[subpel_x != 0][subpel_y != 0][ref]( - src, src_stride, dst, dst_stride, kernel[subpel_x], xs, kernel[subpel_y], - ys, w, h, bd); + CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(src)), src_stride, + CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(dst)), dst_stride, kernel[subpel_x], + xs, kernel[subpel_y], ys, w, h, bd); } #endif // CONFIG_VP9_HIGHBITDEPTH |