diff options
author | 2008-10-25 05:12:34 +0300 | |
---|---|---|
committer | 2008-10-25 05:12:34 +0300 | |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libmpcodecs/vf_yadif.c | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) |
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_yadif.c')
-rw-r--r-- | libmpcodecs/vf_yadif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index 12d85da97e..b4dbaa25c0 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -143,7 +143,7 @@ static void filter_line_mmx2(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, u #define FILTER\ for(x=0; x<w; x+=4){\ - asm volatile(\ + __asm__ volatile(\ "pxor %%mm7, %%mm7 \n\t"\ LOAD4("(%[cur],%[mrefs])", %%mm0) /* c = cur[x-refs] */\ LOAD4("(%[cur],%[prefs])", %%mm1) /* e = cur[x+refs] */\ @@ -260,7 +260,7 @@ static void filter_line_mmx2(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, u [pb1] "m"(pb_1),\ [mode] "g"(mode)\ );\ - asm volatile("movd %%mm1, %0" :"=m"(*dst));\ + __asm__ volatile("movd %%mm1, %0" :"=m"(*dst));\ dst += 4;\ prev+= 4;\ cur += 4;\ @@ -371,7 +371,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], int dst_stride[3], int } } #if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) - if(gCpuCaps.hasMMX2) asm volatile("emms \n\t" : : : "memory"); + if(gCpuCaps.hasMMX2) __asm__ volatile("emms \n\t" : : : "memory"); #endif } |