diff options
| author | James Zern <jzern@google.com> | 2016-01-30 00:17:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-30 00:17:16 +0000 |
| commit | 8faccb709a8402d68993e4a50b2e7b797c7bf3e8 (patch) | |
| tree | 18503af7d3324f47a7902d3ca56c502ff985083b /vpx_dsp/intrapred.c | |
| parent | 8050e0219fae86e4b0603904b576adf4d7f39d35 (diff) | |
| parent | fea27ccca040abd3d3e40e38aac6f87025d383d4 (diff) | |
| download | libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.tar libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.tar.gz libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.tar.bz2 libvpx-8faccb709a8402d68993e4a50b2e7b797c7bf3e8.zip | |
Merge changes If13946e4,I61a1814d,I2ca9aa3c,I44d91eaa
* changes:
intrapred: protect functions w/CONFIG check
vp9_noise_estimate: protect copy_frame w/CONFIG check
vp8_cx_iface: delete 3 unused functions
vp8: mark intra_prediction_down_copy inline
Diffstat (limited to 'vpx_dsp/intrapred.c')
| -rw-r--r-- | vpx_dsp/intrapred.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vpx_dsp/intrapred.c b/vpx_dsp/intrapred.c index a9669e512..912a2e0a6 100644 --- a/vpx_dsp/intrapred.c +++ b/vpx_dsp/intrapred.c @@ -44,6 +44,7 @@ static INLINE void d207_predictor(uint8_t *dst, ptrdiff_t stride, int bs, dst[r * stride + c] = dst[(r + 1) * stride + c - 2]; } +#if CONFIG_MISC_FIXES static INLINE void d207e_predictor(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left) { int r, c; @@ -58,6 +59,7 @@ static INLINE void d207e_predictor(uint8_t *dst, ptrdiff_t stride, int bs, dst += stride; } } +#endif // CONFIG_MISC_FIXES static INLINE void d63_predictor(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left) { @@ -76,6 +78,7 @@ static INLINE void d63_predictor(uint8_t *dst, ptrdiff_t stride, int bs, } } +#if CONFIG_MISC_FIXES static INLINE void d63e_predictor(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left) { int r, c; @@ -89,6 +92,7 @@ static INLINE void d63e_predictor(uint8_t *dst, ptrdiff_t stride, int bs, dst += stride; } } +#endif // CONFIG_MISC_FIXES static INLINE void d45_predictor(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left) { @@ -109,6 +113,7 @@ static INLINE void d45_predictor(uint8_t *dst, ptrdiff_t stride, int bs, } } +#if CONFIG_MISC_FIXES static INLINE void d45e_predictor(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left) { int r, c; @@ -121,6 +126,7 @@ static INLINE void d45e_predictor(uint8_t *dst, ptrdiff_t stride, int bs, dst += stride; } } +#endif // CONFIG_MISC_FIXES static INLINE void d117_predictor(uint8_t *dst, ptrdiff_t stride, int bs, const uint8_t *above, const uint8_t *left) { |