diff options
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | video/filter/vf_divtc.c | 2 | ||||
| -rw-r--r-- | video/filter/vf_eq.c | 2 | ||||
| -rw-r--r-- | video/filter/vf_ilpack.c | 6 | ||||
| -rw-r--r-- | video/filter/vf_noise.c | 6 |
5 files changed, 8 insertions, 23 deletions
@@ -492,7 +492,6 @@ _rpath=no libpostproc=auto libavfilter=no libavdevice=no -_asmalign_pot=auto _stream_cache=yes _priority=no def_dos_paths="#define HAVE_DOS_PATHS 0" @@ -1187,19 +1186,6 @@ echores $pic if x86 ; then -echocheck ".align is a power of two" -if test "$_asmalign_pot" = auto ; then -_asmalign_pot=no -inline_asm_check '".align 3"' && _asmalign_pot=yes -fi -if test "$_asmalign_pot" = "yes" ; then - def_asmalign_pot='#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t"' -else - def_asmalign_pot='#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"' -fi -echores $_asmalign_pot - - echocheck "ebx availability" ebx_available=no def_ebx_available='#define HAVE_EBX_AVAILABLE 0' @@ -3304,7 +3290,6 @@ $def_vsscanf /* system-specific features */ -$def_asmalign_pot $def_dl $def_dos_paths $def_iconv diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index a99bd8f96e..02386d0d3b 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -61,7 +61,7 @@ static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) "pxor %%mm4, %%mm4 \n\t" "pxor %%mm7, %%mm7 \n\t" - ASMALIGN(4) + ".align 4 \n\t" "1: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c index 946fa73550..57945dc379 100644 --- a/video/filter/vf_eq.c +++ b/video/filter/vf_eq.c @@ -149,7 +149,7 @@ void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src, "movq (%6), %%mm4 \n\t" "pxor %%mm0, %%mm0 \n\t" "movl %4, %%eax\n\t" - ASMALIGN(4) + ".align 4\n\t" "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c index 05eff04f26..6519a0c512 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -83,7 +83,7 @@ static void pack_nn_MMX(unsigned char *dst, unsigned char *y, int av_unused us, int av_unused vs) { __asm__ volatile ("" - ASMALIGN(4) + ".align 4 \n\t" "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" @@ -123,7 +123,7 @@ static void pack_li_0_MMX(unsigned char *dst, unsigned char *y, #endif "pxor %%mm0, %%mm0 \n\t" - ASMALIGN(4) + ".align 4 \n\t" ".Lli0: \n\t" "movq (%%"REG_S"), %%mm1 \n\t" "movq (%%"REG_S"), %%mm2 \n\t" @@ -231,7 +231,7 @@ static void pack_li_1_MMX(unsigned char *dst, unsigned char *y, #endif "pxor %%mm0, %%mm0 \n\t" - ASMALIGN(4) + ".align 4 \n\t" ".Lli1: \n\t" "movq (%%"REG_S"), %%mm1 \n\t" "movq (%%"REG_S"), %%mm2 \n\t" diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c index df359833d4..19a41111ed 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -152,7 +152,7 @@ static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int "pcmpeqb %%mm7, %%mm7 \n\t" "psllw $15, %%mm7 \n\t" "packsswb %%mm7, %%mm7 \n\t" - ASMALIGN(4) + ".align 4 \n\t" "1: \n\t" "movq (%0, %%"REG_a"), %%mm0 \n\t" "movq (%1, %%"REG_a"), %%mm1 \n\t" @@ -181,7 +181,7 @@ static inline void lineNoise_MMX2(uint8_t *dst, uint8_t *src, int8_t *noise, int "pcmpeqb %%mm7, %%mm7 \n\t" "psllw $15, %%mm7 \n\t" "packsswb %%mm7, %%mm7 \n\t" - ASMALIGN(4) + ".align 4 \n\t" "1: \n\t" "movq (%0, %%"REG_a"), %%mm0 \n\t" "movq (%1, %%"REG_a"), %%mm1 \n\t" @@ -219,7 +219,7 @@ static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t __asm__ volatile( "mov %5, %%"REG_a" \n\t" - ASMALIGN(4) + ".align 4 \n\t" "1: \n\t" "movq (%1, %%"REG_a"), %%mm1 \n\t" "movq (%0, %%"REG_a"), %%mm0 \n\t" |