summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-28 22:46:22 +0100
committerwm4 <wm4@nowhere>2013-04-13 04:21:29 +0200
commitabd5e8a2e774f20d78a901faac64fe74fdc7b040 (patch)
tree30a7e1e1d1bd57bbc7e0afe2d6b1ae588989fdd3 /audio
parent08eecf070e12d58f3f9e4f7c65b8b1f6c815cc7f (diff)
downloadmpv-abd5e8a2e774f20d78a901faac64fe74fdc7b040.tar.bz2
mpv-abd5e8a2e774f20d78a901faac64fe74fdc7b040.tar.xz
options: remove --af-adv
Anything this option did has been removed in the preceding 3 commits. Note that even though these options sounded like a good idea (like setting accuracy vs. speed tradeoffs), they were not really properly implemented.
Diffstat (limited to 'audio')
-rw-r--r--audio/decode/dec_audio.c2
-rw-r--r--audio/filter/af.c3
-rw-r--r--audio/filter/af.h19
3 files changed, 1 insertions, 23 deletions
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index 69ca3f110c..9d0e51629c 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -41,7 +41,7 @@
int fakemono = 0;
-struct af_cfg af_cfg = {1, NULL}; // Configuration for audio filters
+struct af_cfg af_cfg = {0}; // Configuration for audio filters
static int init_audio_codec(sh_audio_t *sh_audio, const char *decoder)
{
diff --git a/audio/filter/af.c b/audio/filter/af.c
index ec247fb017..47288401f0 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -81,9 +81,6 @@ static struct af_info* filter_list[] = {
NULL
};
-// CPU speed
-int *af_cpu_speed = NULL;
-
/* Find a filter in the static list of filters using it's name. This
function is used internally */
static struct af_info *af_find(char *name)
diff --git a/audio/filter/af.h b/audio/filter/af.h
index 50719c4d1b..bebd21e942 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -80,27 +80,8 @@ struct af_instance {
bool auto_inserted; // inserted by af.c, such as conversion filters
};
-// Initialization flags
-extern int *af_cpu_speed;
-
-#define AF_INIT_AUTO 0x00000000
-#define AF_INIT_SLOW 0x00000001
-#define AF_INIT_FAST 0x00000002
-#define AF_INIT_FORCE 0x00000003
-#define AF_INIT_TYPE_MASK 0x00000003
-
-#define AF_INIT_INT 0x00000000
-#define AF_INIT_FLOAT 0x00000004
-#define AF_INIT_FORMAT_MASK 0x00000004
-
-// Default init type
-#ifndef AF_INIT_TYPE
-#define AF_INIT_TYPE (af_cpu_speed ? *af_cpu_speed : AF_INIT_SLOW)
-#endif
-
// Configuration switches
struct af_cfg {
- int force; // Initialization type
char **list; /* list of names of filters that are added to filter
list during first initialization of stream */
};