diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
| commit | b0986b3760b0174be6a58e1754353102f3230c79 (patch) | |
| tree | 0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /libaf | |
| parent | 5fc54a6caad5f24b993da2e282c896269a6abc49 (diff) | |
| parent | 23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff) | |
| download | mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2 mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz | |
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/af.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libaf/af.h b/libaf/af.h index 40a2f06edb..fe146906e9 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -28,13 +28,6 @@ #include "cpudetect.h" #include "mp_msg.h" -/* Set the initialization type from mplayers cpudetect */ -#ifdef AF_INIT_TYPE -#undef AF_INIT_TYPE -#define AF_INIT_TYPE \ - ((gCpuCaps.has3DNow || gCpuCaps.hasSSE)?AF_INIT_FAST:AF_INIT_SLOW) -#endif - struct af_instance_s; // Number of channels @@ -102,12 +95,8 @@ extern int* af_cpu_speed; // Default init type #ifndef AF_INIT_TYPE -#if HAVE_SSE || HAVE_AMD3DNOW -#define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST) -#else #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW) #endif -#endif // Configuration switches typedef struct af_cfg_s{ |