diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
| commit | ec910d81405c736a4490383a250299a7837c2e64 (patch) | |
| tree | 4f27cc226f93a863121aef6c56313e4153a69b3e /third_party/aom/aom_dsp/variance.h | |
| parent | 01eb57073ba97b2d6cbf20f745dfcc508197adc3 (diff) | |
| download | UXP-ec910d81405c736a4490383a250299a7837c2e64.tar UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.gz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.lz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.xz UXP-ec910d81405c736a4490383a250299a7837c2e64.zip | |
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
Diffstat (limited to 'third_party/aom/aom_dsp/variance.h')
| -rw-r--r-- | third_party/aom/aom_dsp/variance.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/aom/aom_dsp/variance.h b/third_party/aom/aom_dsp/variance.h index 20f0895cb..a193df467 100644 --- a/third_party/aom/aom_dsp/variance.h +++ b/third_party/aom/aom_dsp/variance.h @@ -54,7 +54,7 @@ typedef unsigned int (*aom_subp_avg_variance_fn_t)( const uint8_t *a, int a_stride, int xoffset, int yoffset, const uint8_t *b, int b_stride, unsigned int *sse, const uint8_t *second_pred); -#if CONFIG_AV1 && CONFIG_EXT_INTER +#if CONFIG_AV1 typedef unsigned int (*aom_masked_sad_fn_t)(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, @@ -64,7 +64,7 @@ typedef unsigned int (*aom_masked_subpixvariance_fn_t)( const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse); -#endif // CONFIG_AV1 && CONFIG_EXT_INTER +#endif // CONFIG_AV1 #if CONFIG_AV1 && CONFIG_MOTION_VAR typedef unsigned int (*aom_obmc_sad_fn_t)(const uint8_t *pred, int pred_stride, @@ -90,10 +90,8 @@ typedef struct aom_variance_vtable { aom_sad_multi_fn_t sdx3f; aom_sad_multi_fn_t sdx8f; aom_sad_multi_d_fn_t sdx4df; -#if CONFIG_EXT_INTER aom_masked_sad_fn_t msdf; aom_masked_subpixvariance_fn_t msvf; -#endif // CONFIG_EXT_INTER #if CONFIG_MOTION_VAR aom_obmc_sad_fn_t osdf; aom_obmc_variance_fn_t ovf; |