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_divtc.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_divtc.c')
| -rw-r--r-- | libmpcodecs/vf_divtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c index 4dade860f1..307a14890d 100644 --- a/libmpcodecs/vf_divtc.c +++ b/libmpcodecs/vf_divtc.c @@ -37,7 +37,7 @@ struct vf_priv_s static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) { volatile short out[4]; - asm ( + __asm__ ( "movl $8, %%ecx \n\t" "pxor %%mm4, %%mm4 \n\t" "pxor %%mm7, %%mm7 \n\t" @@ -128,7 +128,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z, unsigned int shift; uint32_t sum, t; unsigned char *e, *e2; -#if MP_WORDSIZE==64 +#if __WORDSIZE==64 typedef uint64_t wsum_t; #else typedef uint32_t wsum_t; @@ -143,7 +143,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z, for(wsum=0, e2=e-sizeof(wsum_t)+1; p<e2; p+=sizeof(wsum_t)) wsum^=*(wsum_t *)p; -#if MP_WORDSIZE==64 +#if __WORDSIZE==64 t=be2me_32((uint32_t)(wsum>>32^wsum)); #else t=be2me_32(wsum); |