diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
commit | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (patch) | |
tree | a5f3a6d636e96f05bb52f0b2407107a7f0c8b443 /libmpcodecs/vf_filmdint.c | |
parent | 03aa64687fc109c5f2346a3c191b70698b333509 (diff) | |
parent | 0e77da241da8b911c96a0e22898e84d7f7b74678 (diff) | |
download | mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.bz2 mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.xz |
Merge svn changes up to r28403
Diffstat (limited to 'libmpcodecs/vf_filmdint.c')
-rw-r--r-- | libmpcodecs/vf_filmdint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index 45e0907cc5..5427171fbd 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -431,7 +431,7 @@ block_metrics_3dnow(unsigned char *a, unsigned char *b, int as, int bs, int lines, struct vf_priv_s *p, struct frame_stats *s) { struct metrics tm; -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW mp_msg(MSGT_VFILTER, MSGL_FATAL, "block_metrics_3dnow: internal error\n"); #else static const unsigned long long ones = 0x0101010101010101ull; @@ -1424,7 +1424,7 @@ static int open(vf_instance_t *vf, char* args) #if !HAVE_MMX p->mmx2 = 0; #endif -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW p->mmx2 &= 1; #endif p->thres.odd = p->thres.even; |