summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_tfields.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-19 00:04:43 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-19 00:04:43 +0200
commit79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch)
treecc52764dfa4fab2cfc74c6aee5d71b27edbf014b /libmpcodecs/vf_tfields.c
parent3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff)
parent39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff)
downloadmpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2
mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz
Merge svn changes up to r28341
Conflicts: configure libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'libmpcodecs/vf_tfields.c')
-rw-r--r--libmpcodecs/vf_tfields.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c
index 347cd4bb9e..0ebf41ddb2 100644
--- a/libmpcodecs/vf_tfields.c
+++ b/libmpcodecs/vf_tfields.c
@@ -47,7 +47,7 @@ static void deint(unsigned char *dest, int ds, unsigned char *src, int ss, int w
}
}
-#ifdef HAVE_3DNOW
+#if HAVE_3DNOW
static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up)
{
int i, j, ssd=ss;
@@ -83,7 +83,7 @@ static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int
}
#endif
-#ifdef HAVE_MMX2
+#if HAVE_MMX2
static void qpel_li_MMX2(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up)
{
int i, j, ssd=ss;
@@ -120,7 +120,7 @@ static void qpel_li_MMX2(unsigned char *d, unsigned char *s, int w, int h, int d
}
#endif
-#ifdef HAVE_MMX
+#if HAVE_MMX
static void qpel_li_MMX(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up)
{
int i, j, ssd=ss;
@@ -480,14 +480,14 @@ static int open(vf_instance_t *vf, char* args)
if (args) sscanf(args, "%d:%d", &vf->priv->mode, &vf->priv->parity);
qpel_li = qpel_li_C;
qpel_4tap = qpel_4tap_C;
-#ifdef HAVE_MMX
+#if HAVE_MMX
if(gCpuCaps.hasMMX) qpel_li = qpel_li_MMX;
if(gCpuCaps.hasMMX) qpel_4tap = qpel_4tap_MMX;
#endif
-#ifdef HAVE_MMX2
+#if HAVE_MMX2
if(gCpuCaps.hasMMX2) qpel_li = qpel_li_MMX2;
#endif
-#ifdef HAVE_3DNOW
+#if HAVE_3DNOW
if(gCpuCaps.has3DNow) qpel_li = qpel_li_3DNOW;
#endif
return 1;