diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /liba52/srfftp_3dnow.h | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'liba52/srfftp_3dnow.h')
-rw-r--r-- | liba52/srfftp_3dnow.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/liba52/srfftp_3dnow.h b/liba52/srfftp_3dnow.h index c5e6dd1c24..9f26c59b43 100644 --- a/liba52/srfftp_3dnow.h +++ b/liba52/srfftp_3dnow.h @@ -39,7 +39,7 @@ typedef struct }i_cmplx_t; #define TRANS_FILL_MM6_MM7_3DNOW()\ - __asm__ __volatile__(\ + __asm__ volatile(\ "movq %1, %%mm7\n\t"\ "movq %0, %%mm6\n\t"\ ::"m"(x_plus_minus_3dnow),\ @@ -66,7 +66,7 @@ typedef struct #define TRANSZERO_3DNOW(A0,A4,A8,A12) \ { \ - __asm__ __volatile__(\ + __asm__ volatile(\ "movq %4, %%mm0\n\t" /* mm0 = wTB[0]*/\ "movq %5, %%mm1\n\t" /* mm1 = wTB[k*2]*/ \ "movq %%mm0, %%mm5\n\t"/*u.re = wTB[0].re + wTB[k*2].re;*/\ @@ -95,7 +95,7 @@ typedef struct #define TRANSHALF_16_3DNOW(A2,A6,A10,A14)\ {\ - __asm__ __volatile__(\ + __asm__ volatile(\ "movq %4, %%mm0\n\t"/*u.re = wTB[2].im + wTB[2].re;*/\ "movq %%mm0, %%mm1\n\t"\ "pxor %%mm7, %%mm1\n\t"\ @@ -136,7 +136,7 @@ typedef struct #define TRANS_3DNOW(A1,A5,A9,A13,WT,WB,D,D3)\ { \ - __asm__ __volatile__(\ + __asm__ volatile(\ "movq %1, %%mm4\n\t"\ "movq %%mm4, %%mm5\n\t"\ "punpckldq %%mm4, %%mm4\n\t"/*mm4 = D.re | D.re */\ @@ -166,7 +166,7 @@ typedef struct :\ :"m"(WT), "m"(D), "m"(WB), "m"(D3)\ :"memory");\ - __asm__ __volatile__(\ + __asm__ volatile(\ "movq %4, %%mm0\n\t"/* a1 = A1*/\ "movq %5, %%mm2\n\t"/* a1 = A5*/\ "movq %%mm0, %%mm1\n\t"\ |