From 9568a284ab9a300c702680ed7054c5d98c87794e Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Mon, 1 Feb 2016 12:29:36 -0800 Subject: [PATCH] Fix automerge errors Change-Id: I24d415bafe617eac894427088d7b2fbe0b7e04d7 --- vpx_dsp/intrapred.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vpx_dsp/intrapred.c b/vpx_dsp/intrapred.c index 0a5be6d28..18bcd87f2 100644 --- a/vpx_dsp/intrapred.c +++ b/vpx_dsp/intrapred.c @@ -44,7 +44,6 @@ 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; @@ -59,7 +58,6 @@ 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) { @@ -78,7 +76,6 @@ 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; @@ -92,7 +89,6 @@ 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) { @@ -113,7 +109,6 @@ 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; @@ -126,7 +121,6 @@ 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) { -- 2.40.0