aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-09 04:43:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-09 04:44:32 +0200
commit5fbf9c12aa0ddafa4b89dac70a02251d32814d0d (patch)
tree0a6cf6ae4f4e06bbe3e0bd1aee08dc228de6c1c9
parent9dc88ac3676e2dd2e2940fb3606c76a69452bf1d (diff)
downloadffmpeg-5fbf9c12aa0ddafa4b89dac70a02251d32814d0d.tar.gz
avfilter/vf_noise: fix build without mmx*inline
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/vf_noise.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c
index 4ee6361c22..84205cbe1a 100644
--- a/libavfilter/vf_noise.c
+++ b/libavfilter/vf_noise.c
@@ -214,10 +214,10 @@ static inline void line_noise_c(uint8_t *dst, const uint8_t *src, int8_t *noise,
#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t"
-#if HAVE_MMX_INLINE
static void line_noise_mmx(uint8_t *dst, const uint8_t *src,
int8_t *noise, int len, int shift)
{
+#if HAVE_MMX_INLINE
x86_reg mmx_len= len&(~7);
noise+=shift;
@@ -241,13 +241,13 @@ static void line_noise_mmx(uint8_t *dst, const uint8_t *src,
);
if (mmx_len!=len)
line_noise_c(dst+mmx_len, src+mmx_len, noise+mmx_len, len-mmx_len, 0);
-}
#endif
+}
-#if HAVE_MMXEXT_INLINE
static void line_noise_mmxext(uint8_t *dst, const uint8_t *src,
int8_t *noise, int len, int shift)
{
+#if HAVE_MMXEXT_INLINE
x86_reg mmx_len= len&(~7);
noise+=shift;
@@ -271,8 +271,8 @@ static void line_noise_mmxext(uint8_t *dst, const uint8_t *src,
);
if (mmx_len != len)
line_noise_c(dst+mmx_len, src+mmx_len, noise+mmx_len, len-mmx_len, 0);
-}
#endif
+}
static inline void line_noise_avg_c(uint8_t *dst, const uint8_t *src,
int len, int8_t **shift)
@@ -286,10 +286,10 @@ static inline void line_noise_avg_c(uint8_t *dst, const uint8_t *src,
}
}
-#if HAVE_MMX_INLINE
static inline void line_noise_avg_mmx(uint8_t *dst, const uint8_t *src,
int len, int8_t **shift)
{
+#if HAVE_MMX_INLINE
x86_reg mmx_len= len&(~7);
__asm__ volatile(
@@ -327,8 +327,8 @@ static inline void line_noise_avg_mmx(uint8_t *dst, const uint8_t *src,
int8_t *shift2[3]={shift[0]+mmx_len, shift[1]+mmx_len, shift[2]+mmx_len};
line_noise_avg_c(dst+mmx_len, src+mmx_len, len-mmx_len, shift2);
}
-}
#endif
+}
static void noise(uint8_t *dst, const uint8_t *src,
int dst_linesize, int src_linesize,