diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:04:07 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:07:30 +0200 |
commit | 69fe2522f8c2a04eda112eee6319ca2e85d7038b (patch) | |
tree | 83a8b19997e621309344ca1f3997a48886ef0944 /libmpeg2/motion_comp_mmx.c | |
parent | 9436e0452fad48e671d7320cb18c588655f3d230 (diff) | |
parent | 1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff) | |
download | mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.bz2 mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.xz |
Merge svn changes up to r30301
Diffstat (limited to 'libmpeg2/motion_comp_mmx.c')
-rw-r--r-- | libmpeg2/motion_comp_mmx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libmpeg2/motion_comp_mmx.c b/libmpeg2/motion_comp_mmx.c index b550f8c7c9..d89c2bd591 100644 --- a/libmpeg2/motion_comp_mmx.c +++ b/libmpeg2/motion_comp_mmx.c @@ -36,6 +36,7 @@ #define CPU_3DNOW 1 +#if HAVE_MMX /* MMX code - needs a rewrite */ /* @@ -496,6 +497,7 @@ static void MC_put_y_8_mmx (uint8_t * dest, const uint8_t * ref, MPEG2_MC_EXTERN (mmx) +#endif /* HAVE_MMX */ @@ -802,6 +804,8 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, } while (--height); } +#if HAVE_MMX2 + static void MC_avg_o_16_mmxext (uint8_t * dest, const uint8_t * ref, int stride, int height) { @@ -901,7 +905,9 @@ static void MC_put_xy_8_mmxext (uint8_t * dest, const uint8_t * ref, MPEG2_MC_EXTERN (mmxext) +#endif /* HAVE_MMX2 */ +#if HAVE_AMD3DNOW static void MC_avg_o_16_3dnow (uint8_t * dest, const uint8_t * ref, int stride, int height) @@ -1002,4 +1008,6 @@ static void MC_put_xy_8_3dnow (uint8_t * dest, const uint8_t * ref, MPEG2_MC_EXTERN (3dnow) +#endif /* HAVE_AMD3DNOW */ + #endif |