diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
| commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
| tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /cpudetect.c | |
| parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
| parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
| download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz | |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'cpudetect.c')
| -rw-r--r-- | cpudetect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpudetect.c b/cpudetect.c index 9756dfb454..fee0c8fc1f 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -232,7 +232,7 @@ void GetCpuCaps( CpuCaps *caps) if(caps->has3DNow) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNow supported but disabled\n"); caps->has3DNow=0; #endif -#if !HAVE_3DNOWEX +#if !HAVE_3DNOWEXT if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n"); caps->has3DNowExt=0; #endif |