diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-24 10:08:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-24 10:08:19 -0700 |
| commit | 710ca1fe3621db7c35768d22de3cfff6aecdfd25 (patch) | |
| tree | 823313f2c444f7836a67246593f97e52329fcb3e /vp9/common/vp9_reconinter.h | |
| parent | 153d70ca9bb8ea4f49e2f3b3cb43ed9906aa8a81 (diff) | |
| parent | ad867fe237d15b3b5f7f16469558bf78f7f40378 (diff) | |
| download | libvpx-710ca1fe3621db7c35768d22de3cfff6aecdfd25.tar libvpx-710ca1fe3621db7c35768d22de3cfff6aecdfd25.tar.gz libvpx-710ca1fe3621db7c35768d22de3cfff6aecdfd25.tar.bz2 libvpx-710ca1fe3621db7c35768d22de3cfff6aecdfd25.zip | |
Merge changes I1868fb75,I9ff504c6
* changes:
Renaming INTERPOLATIONFILTERTYPE to INTERPOLATION_TYPE.
Adding VP9_FRAME_MARKER constant.
Diffstat (limited to 'vp9/common/vp9_reconinter.h')
| -rw-r--r-- | vp9/common/vp9_reconinter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 610ee4acc..2c8a6e4d9 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -25,7 +25,7 @@ void vp9_build_inter_predictors_sb(MACROBLOCKD *xd, int mi_row, int mi_col, BLOCK_SIZE bsize); void vp9_setup_interp_filters(MACROBLOCKD *xd, - INTERPOLATIONFILTERTYPE filter, + INTERPOLATION_TYPE filter, VP9_COMMON *cm); void vp9_build_inter_predictor(const uint8_t *src, int src_stride, |