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 /libmpcodecs/vf_tfields.c | |
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 'libmpcodecs/vf_tfields.c')
-rw-r--r-- | libmpcodecs/vf_tfields.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c index 893c059972..0d88119371 100644 --- a/libmpcodecs/vf_tfields.c +++ b/libmpcodecs/vf_tfields.c @@ -59,7 +59,7 @@ static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int s += ss; } for (i=h-1; i; i--) { - asm volatile( + __asm__ volatile( "1: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" "movq (%%"REG_S",%%"REG_a"), %%mm1 \n\t" @@ -79,7 +79,7 @@ static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int s += ss; } if (!up) fast_memcpy(d, s, w); - asm volatile("emms \n\t" : : : "memory"); + __asm__ volatile("emms \n\t" : : : "memory"); } #endif @@ -95,7 +95,7 @@ static void qpel_li_MMX2(unsigned char *d, unsigned char *s, int w, int h, int d s += ss; } for (i=h-1; i; i--) { - asm volatile( + __asm__ volatile( "pxor %%mm7, %%mm7 \n\t" "2: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" @@ -116,7 +116,7 @@ static void qpel_li_MMX2(unsigned char *d, unsigned char *s, int w, int h, int d s += ss; } if (!up) fast_memcpy(d, s, w); - asm volatile("emms \n\t" : : : "memory"); + __asm__ volatile("emms \n\t" : : : "memory"); } #endif @@ -132,7 +132,7 @@ static void qpel_li_MMX(unsigned char *d, unsigned char *s, int w, int h, int ds s += ss; } for (i=h-1; i; i--) { - asm volatile( + __asm__ volatile( "pxor %%mm7, %%mm7 \n\t" "3: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" @@ -166,7 +166,7 @@ static void qpel_li_MMX(unsigned char *d, unsigned char *s, int w, int h, int ds s += ss; } if (!up) fast_memcpy(d, s, w); - asm volatile("emms \n\t" : : : "memory"); + __asm__ volatile("emms \n\t" : : : "memory"); } static void qpel_4tap_MMX(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up) @@ -186,7 +186,7 @@ static void qpel_4tap_MMX(unsigned char *d, unsigned char *s, int w, int h, int d[j] = (s[j+ssd] + 3*s[j])>>2; d += ds; s += ss; for (i=h-3; i; i--) { - asm volatile( + __asm__ volatile( "pxor %%mm0, %%mm0 \n\t" "movq (%%"REG_d"), %%mm4 \n\t" "movq 8(%%"REG_d"), %%mm5 \n\t" @@ -246,7 +246,7 @@ static void qpel_4tap_MMX(unsigned char *d, unsigned char *s, int w, int h, int d[j] = (s[j+ssd] + 3*s[j])>>2; d += ds; s += ss; if (!up) fast_memcpy(d, s, w); - asm volatile("emms \n\t" : : : "memory"); + __asm__ volatile("emms \n\t" : : : "memory"); } #endif |