diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
| commit | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch) | |
| tree | cc52764dfa4fab2cfc74c6aee5d71b27edbf014b /libmpcodecs/vf_decimate.c | |
| parent | 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff) | |
| parent | 39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff) | |
| download | mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2 mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz | |
Merge svn changes up to r28341
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'libmpcodecs/vf_decimate.c')
| -rw-r--r-- | libmpcodecs/vf_decimate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c index 81b58cccb7..36afff3b7d 100644 --- a/libmpcodecs/vf_decimate.c +++ b/libmpcodecs/vf_decimate.c @@ -19,7 +19,7 @@ struct vf_priv_s { int max, last, cnt; }; -#ifdef HAVE_MMX +#if HAVE_MMX static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) { volatile short out[4]; @@ -164,7 +164,7 @@ static int open(vf_instance_t *vf, char* args) p->frac = 0.33; if (args) sscanf(args, "%d:%d:%d:%f", &p->max, &p->hi, &p->lo, &p->frac); diff = diff_C; -#ifdef HAVE_MMX +#if HAVE_MMX if(gCpuCaps.hasMMX) diff = diff_MMX; #endif return 1; |