25 files changed, 52 insertions, 53 deletions
diff --git a/libaf/af.c b/libaf/af.c
index f2745c5b59..17bbd6a619 100644
--- a/libaf/af.c
+++ b/libaf/af.c
@@ -25,31 +25,31 @@
 #include "af.h"
 
 // Static list of filters
-extern af_info_t af_info_dummy;
-extern af_info_t af_info_delay;
-extern af_info_t af_info_channels;
-extern af_info_t af_info_format;
-extern af_info_t af_info_resample;
-extern af_info_t af_info_volume;
-extern af_info_t af_info_equalizer;
-extern af_info_t af_info_pan;
-extern af_info_t af_info_surround;
-extern af_info_t af_info_sub;
-extern af_info_t af_info_export;
-extern af_info_t af_info_volnorm;
-extern af_info_t af_info_extrastereo;
-extern af_info_t af_info_lavcac3enc;
-extern af_info_t af_info_lavcresample;
-extern af_info_t af_info_sweep;
-extern af_info_t af_info_hrtf;
-extern af_info_t af_info_ladspa;
-extern af_info_t af_info_center;
-extern af_info_t af_info_sinesuppress;
-extern af_info_t af_info_karaoke;
-extern af_info_t af_info_scaletempo;
-extern af_info_t af_info_bs2b;
-
-static af_info_t* filter_list[]={
+extern struct af_info af_info_dummy;
+extern struct af_info af_info_delay;
+extern struct af_info af_info_channels;
+extern struct af_info af_info_format;
+extern struct af_info af_info_resample;
+extern struct af_info af_info_volume;
+extern struct af_info af_info_equalizer;
+extern struct af_info af_info_pan;
+extern struct af_info af_info_surround;
+extern struct af_info af_info_sub;
+extern struct af_info af_info_export;
+extern struct af_info af_info_volnorm;
+extern struct af_info af_info_extrastereo;
+extern struct af_info af_info_lavcac3enc;
+extern struct af_info af_info_lavcresample;
+extern struct af_info af_info_sweep;
+extern struct af_info af_info_hrtf;
+extern struct af_info af_info_ladspa;
+extern struct af_info af_info_center;
+extern struct af_info af_info_sinesuppress;
+extern struct af_info af_info_karaoke;
+extern struct af_info af_info_scaletempo;
+extern struct af_info af_info_bs2b;
+
+static struct af_info* filter_list[]={
    &af_info_dummy,
    &af_info_delay,
    &af_info_channels,
@@ -87,7 +87,7 @@ int* af_cpu_speed = NULL;
 
 /* Find a filter in the static list of filters using it's name. This
    function is used internally */
-static af_info_t* af_find(char*name)
+static struct af_info* af_find(char*name)
 {
   int i=0;
   while(filter_list[i]){
diff --git a/libaf/af.h b/libaf/af.h
index e782759f77..90407ef97f 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -53,20 +53,19 @@ struct mp_audio {
 
 /* Audio filter information not specific for current instance, but for
    a specific filter */
-typedef struct af_info_s
-{
+struct af_info {
   const char *info;
   const char *name;
   const char *author;
   const char *comment;
   const int flags;
   int (*open)(struct af_instance_s* vf);
-} af_info_t;
+};
 
 // Linked list of audio filters
 typedef struct af_instance_s
 {
-  af_info_t* info;
+  struct af_info* info;
   int (*control)(struct af_instance_s* af, int cmd, void* arg);
   void (*uninit)(struct af_instance_s* af);
   struct mp_audio* (*play)(struct af_instance_s* af, struct mp_audio* data);
diff --git a/libaf/af_bs2b.c b/libaf/af_bs2b.c
index 100ad02aa1..8d4a75e731 100644
--- a/libaf/af_bs2b.c
+++ b/libaf/af_bs2b.c
@@ -264,7 +264,7 @@ static int af_open(af_instance_t *af)
 }
 
 /// Description of this filter
-af_info_t af_info_bs2b = {
+struct af_info af_info_bs2b = {
     "Bauer stereophonic-to-binaural audio filter",
     "bs2b",
     "Andrew Savchenko",
diff --git a/libaf/af_center.c b/libaf/af_center.c
index e0897d5e65..4622195e0f 100644
--- a/libaf/af_center.c
+++ b/libaf/af_center.c
@@ -119,7 +119,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_center = {
+struct af_info af_info_center = {
     "Audio filter for adding a center channel",
     "center",
     "Alex Beregszaszi",
diff --git a/libaf/af_channels.c b/libaf/af_channels.c
index 671d9aa32a..5344e7b1fd 100644
--- a/libaf/af_channels.c
+++ b/libaf/af_channels.c
@@ -296,7 +296,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_channels = {
+struct af_info af_info_channels = {
   "Insert or remove channels",
   "channels",
   "Anders",
diff --git a/libaf/af_delay.c b/libaf/af_delay.c
index 15e0c7071f..09f1a1c4b0 100644
--- a/libaf/af_delay.c
+++ b/libaf/af_delay.c
@@ -190,7 +190,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_delay = {
+struct af_info af_info_delay = {
     "Delay audio filter",
     "delay",
     "Anders",
diff --git a/libaf/af_dummy.c b/libaf/af_dummy.c
index 26aa9b5e22..62add27979 100644
--- a/libaf/af_dummy.c
+++ b/libaf/af_dummy.c
@@ -66,7 +66,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_dummy = {
+struct af_info af_info_dummy = {
     "dummy",
     "dummy",
     "Anders",
diff --git a/libaf/af_equalizer.c b/libaf/af_equalizer.c
index 112926dee6..35b1dbc8b0 100644
--- a/libaf/af_equalizer.c
+++ b/libaf/af_equalizer.c
@@ -238,7 +238,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_equalizer = {
+struct af_info af_info_equalizer = {
   "Equalizer audio filter",
   "equalizer",
   "Anders",
diff --git a/libaf/af_export.c b/libaf/af_export.c
index 0239791905..110c46eb66 100644
--- a/libaf/af_export.c
+++ b/libaf/af_export.c
@@ -263,7 +263,7 @@ static int af_open( af_instance_t* af )
 }
 
 // Description of this filter
-af_info_t af_info_export = {
+struct af_info af_info_export = {
     "Sound export filter",
     "export",
     "Anders; Gustavo Sverzut Barbieri <gustavo.barbieri@ic.unicamp.br>",
diff --git a/libaf/af_extrastereo.c b/libaf/af_extrastereo.c
index c1ae719c31..ed8b946c2a 100644
--- a/libaf/af_extrastereo.c
+++ b/libaf/af_extrastereo.c
@@ -147,7 +147,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_extrastereo = {
+struct af_info af_info_extrastereo = {
     "Increase difference between audio channels",
     "extrastereo",
     "Alex Beregszaszi & Pierre Lombard",
diff --git a/libaf/af_format.c b/libaf/af_format.c
index a9d1fe6c88..908861df98 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -325,7 +325,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_format = {
+struct af_info af_info_format = {
   "Sample format conversion",
   "format",
   "Anders",
diff --git a/libaf/af_hrtf.c b/libaf/af_hrtf.c
index 1aab8adcf6..0dc408ab63 100644
--- a/libaf/af_hrtf.c
+++ b/libaf/af_hrtf.c
@@ -660,7 +660,7 @@ static int af_open(af_instance_t* af)
 }
 
 /* Description of this filter */
-af_info_t af_info_hrtf = {
+struct af_info af_info_hrtf = {
     "HRTF Headphone",
     "hrtf",
     "ylai",
diff --git a/libaf/af_karaoke.c b/libaf/af_karaoke.c
index 1e8e313fa9..7717313e2c 100644
--- a/libaf/af_karaoke.c
+++ b/libaf/af_karaoke.c
@@ -88,7 +88,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_karaoke = {
+struct af_info af_info_karaoke = {
 	"Simple karaoke/voice-removal audio filter",
 	"karaoke",
 	"Reynaldo H. Verdejo Pinochet",
diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c
index 0c83024b70..a377a53088 100644
--- a/libaf/af_ladspa.c
+++ b/libaf/af_ladspa.c
@@ -102,7 +102,7 @@ static int af_ladspa_malloc_failed(char*);
 
 /* Description */
 
-af_info_t af_info_ladspa = {
+struct af_info af_info_ladspa = {
     "LADSPA plugin loader",
     "ladspa",
     "Ivo van Poorten",
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c
index a67eb28daf..8547fc6282 100644
--- a/libaf/af_lavcac3enc.c
+++ b/libaf/af_lavcac3enc.c
@@ -322,7 +322,7 @@ static int af_open(af_instance_t* af){
     return AF_OK;
 }
 
-af_info_t af_info_lavcac3enc = {
+struct af_info af_info_lavcac3enc = {
     "runtime encode to ac3 using libavcodec",
     "lavcac3enc",
     "Ulion",
diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c
index e32d3acd9d..ee46561740 100644
--- a/libaf/af_lavcresample.c
+++ b/libaf/af_lavcresample.c
@@ -203,7 +203,7 @@ static int af_open(af_instance_t* af){
   return AF_OK;
 }
 
-af_info_t af_info_lavcresample = {
+struct af_info af_info_lavcresample = {
   "Sample frequency conversion using libavcodec",
   "lavcresample",
   "Michael Niedermayer",
diff --git a/libaf/af_pan.c b/libaf/af_pan.c
index 6acc4be079..ee14d0ed37 100644
--- a/libaf/af_pan.c
+++ b/libaf/af_pan.c
@@ -200,7 +200,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_pan = {
+struct af_info af_info_pan = {
     "Panning audio filter",
     "pan",
     "Anders",
diff --git a/libaf/af_resample.c b/libaf/af_resample.c
index ad6a26a02d..f531066cbc 100644
--- a/libaf/af_resample.c
+++ b/libaf/af_resample.c
@@ -384,7 +384,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this plugin
-af_info_t af_info_resample = {
+struct af_info af_info_resample = {
   "Sample frequency conversion",
   "resample",
   "Anders",
diff --git a/libaf/af_scaletempo.c b/libaf/af_scaletempo.c
index 151a33b874..0d18ed4d6a 100644
--- a/libaf/af_scaletempo.c
+++ b/libaf/af_scaletempo.c
@@ -571,7 +571,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_scaletempo = {
+struct af_info af_info_scaletempo = {
   "Scale audio tempo while maintaining pitch",
   "scaletempo",
   "Robert Juliano",
diff --git a/libaf/af_sinesuppress.c b/libaf/af_sinesuppress.c
index bb30e19f22..dd356af991 100644
--- a/libaf/af_sinesuppress.c
+++ b/libaf/af_sinesuppress.c
@@ -174,7 +174,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_sinesuppress = {
+struct af_info af_info_sinesuppress = {
     "Sine Suppress",
     "sinesuppress",
     "Michael Niedermayer",
diff --git a/libaf/af_sub.c b/libaf/af_sub.c
index 2be755984b..e5944fc6fe 100644
--- a/libaf/af_sub.c
+++ b/libaf/af_sub.c
@@ -178,7 +178,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_sub = {
+struct af_info af_info_sub = {
     "Audio filter for adding a sub-base channel",
     "sub",
     "Anders",
diff --git a/libaf/af_surround.c b/libaf/af_surround.c
index 012c1da9f9..31ae44740a 100644
--- a/libaf/af_surround.c
+++ b/libaf/af_surround.c
@@ -262,7 +262,7 @@ static int af_open(af_instance_t* af){
   return AF_OK;
 }
 
-af_info_t af_info_surround =
+struct af_info af_info_surround =
 {
         "Surround decoder filter",
         "surround",
diff --git a/libaf/af_sweep.c b/libaf/af_sweep.c
index f61e846619..c02be5075c 100644
--- a/libaf/af_sweep.c
+++ b/libaf/af_sweep.c
@@ -93,7 +93,7 @@ static int af_open(af_instance_t* af){
   return AF_OK;
 }
 
-af_info_t af_info_sweep = {
+struct af_info af_info_sweep = {
   "sine sweep",
   "sweep",
   "Michael Niedermayer",
diff --git a/libaf/af_volnorm.c b/libaf/af_volnorm.c
index 80a9d31471..d4248d23af 100644
--- a/libaf/af_volnorm.c
+++ b/libaf/af_volnorm.c
@@ -343,7 +343,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_volnorm = {
+struct af_info af_info_volnorm = {
     "Volume normalizer filter",
     "volnorm",
     "Alex Beregszaszi & Pierre Lombard",
diff --git a/libaf/af_volume.c b/libaf/af_volume.c
index 8ce60b5eac..bf45e2646a 100644
--- a/libaf/af_volume.c
+++ b/libaf/af_volume.c
@@ -216,7 +216,7 @@ static int af_open(af_instance_t* af){
 }
 
 // Description of this filter
-af_info_t af_info_volume = {
+struct af_info af_info_volume = {
     "Volume control audio filter",
     "volume",
     "Anders",