diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 23:49:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 23:51:03 +0200 |
| commit | b6851d34c0658c10804fbca41d1572f1d751b5cf (patch) | |
| tree | 2696e97369c8d0add07d55f12f751d063f933546 | |
| parent | b2527d5d5a23127cb1676730a9210ea65cf82288 (diff) | |
| download | ffmpeg-b6851d34c0658c10804fbca41d1572f1d751b5cf.tar.gz | |
x86/gradfun: fix compilation failure on open solaris
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/x86/gradfun.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c index 4a0c01209c..7600539b6f 100644 --- a/libavfilter/x86/gradfun.c +++ b/libavfilter/x86/gradfun.c @@ -26,9 +26,9 @@ DECLARE_ALIGNED(16, static const uint16_t, pw_7f)[8] = {0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F}; DECLARE_ALIGNED(16, static const uint16_t, pw_ff)[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; -#if HAVE_MMX2 static void gradfun_filter_line_mmx2(uint8_t *dst, const uint8_t *src, const uint16_t *dc, int width, int thresh, const uint16_t *dithers) { +#if HAVE_MMX2 intptr_t x; if (width & 3) { x = width & ~3; @@ -71,12 +71,12 @@ static void gradfun_filter_line_mmx2(uint8_t *dst, const uint8_t *src, const uin "rm"(thresh), "m"(*dithers), "m"(*pw_7f) :"memory" ); -} #endif +} -#if HAVE_SSSE3 static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc, int width, int thresh, const uint16_t *dithers) { +#if HAVE_SSSE3 intptr_t x; if (width & 7) { // could be 10% faster if I somehow eliminated this @@ -118,12 +118,12 @@ static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const ui "rm"(thresh), "m"(*dithers), "m"(*pw_7f) :"memory" ); -} #endif // HAVE_SSSE3 +} -#if HAVE_SSE static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1, const uint8_t *src, int src_linesize, int width) { +#if HAVE_SSE #define BLURV(load)\ intptr_t x = -2*width;\ __asm__ volatile(\ @@ -161,8 +161,8 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t * } else { BLURV("movdqa"); } -} #endif // HAVE_SSE +} av_cold void ff_gradfun_init_x86(GradFunContext *gf) { |