summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-23 19:05:47 +0200
committerwm4 <wm4@nowhere>2013-10-23 19:30:01 +0200
commitb08617ff710db2446e59692a7e11336f33a1595b (patch)
tree468362314f5e2d0ce313a6ac9ff784e72094e75f
parenta46453347f40a3e5be72bf8c3a8461a32bd7733f (diff)
downloadmpv-b08617ff710db2446e59692a7e11336f33a1595b.tar.bz2
mpv-b08617ff710db2446e59692a7e11336f33a1595b.tar.xz
audio/filter: remove useless af_info fields
Drop the author and comment fields. They were completely unused - not even printed in verbose mode, just dead weight. Also use designated initializers and drop redundant flags.
-rw-r--r--audio/filter/af.h2
-rw-r--r--audio/filter/af_bs2b.c9
-rw-r--r--audio/filter/af_center.c10
-rw-r--r--audio/filter/af_channels.c11
-rw-r--r--audio/filter/af_convert24.c9
-rw-r--r--audio/filter/af_convertsignendian.c9
-rw-r--r--audio/filter/af_delay.c11
-rw-r--r--audio/filter/af_drc.c10
-rw-r--r--audio/filter/af_dummy.c11
-rw-r--r--audio/filter/af_equalizer.c10
-rw-r--r--audio/filter/af_export.c11
-rw-r--r--audio/filter/af_extrastereo.c10
-rw-r--r--audio/filter/af_format.c9
-rw-r--r--audio/filter/af_hrtf.c11
-rw-r--r--audio/filter/af_karaoke.c10
-rw-r--r--audio/filter/af_ladspa.c9
-rw-r--r--audio/filter/af_lavcac3enc.c9
-rw-r--r--audio/filter/af_lavfi.c9
-rw-r--r--audio/filter/af_lavrresample.c10
-rw-r--r--audio/filter/af_pan.c9
-rw-r--r--audio/filter/af_scaletempo.c9
-rw-r--r--audio/filter/af_sinesuppress.c9
-rw-r--r--audio/filter/af_sub.c10
-rw-r--r--audio/filter/af_surround.c10
-rw-r--r--audio/filter/af_sweep.c9
-rw-r--r--audio/filter/af_volume.c10
26 files changed, 94 insertions, 152 deletions
diff --git a/audio/filter/af.h b/audio/filter/af.h
index 23dfa9d4fb..088e02dc6a 100644
--- a/audio/filter/af.h
+++ b/audio/filter/af.h
@@ -45,8 +45,6 @@ struct af_instance;
struct af_info {
const char *info;
const char *name;
- const char *author;
- const char *comment;
const int flags;
int (*open)(struct af_instance *vf);
bool (*test_conversion)(int src_format, int dst_format);
diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index e8178ea549..aa92b8be23 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -197,12 +197,9 @@ static int af_open(struct af_instance *af)
/// Description of this filter
struct af_info af_info_bs2b = {
- "Bauer stereophonic-to-binaural audio filter",
- "bs2b",
- "Andrew Savchenko",
- "",
- AF_FLAGS_REENTRANT,
- af_open,
+ .info = "Bauer stereophonic-to-binaural audio filter",
+ .name = "bs2b",
+ .open = af_open,
.priv_size = sizeof(struct af_bs2b),
.options = (const struct m_option[]) {
OPT_INTRANGE("fcut", fcut, 0, BS2B_MINFCUT, BS2B_MAXFCUT),
diff --git a/audio/filter/af_center.c b/audio/filter/af_center.c
index 42571eea35..e04b5ceced 100644
--- a/audio/filter/af_center.c
+++ b/audio/filter/af_center.c
@@ -119,10 +119,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_center = {
- "Audio filter for adding a center channel",
- "center",
- "Alex Beregszaszi",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Audio filter for adding a center channel",
+ .name = "center",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c
index 7955018ec0..fc1a090f7f 100644
--- a/audio/filter/af_channels.c
+++ b/audio/filter/af_channels.c
@@ -3,6 +3,8 @@
* command line parameter channels. It is stupid and can only add
* silence or copy channels, not mix or filter.
*
+ * Original author: Anders
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -262,10 +264,7 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_channels = {
- "Insert or remove channels",
- "channels",
- "Anders",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "Insert or remove channels",
+ .name = "channels",
+ .open = af_open,
};
diff --git a/audio/filter/af_convert24.c b/audio/filter/af_convert24.c
index f3d9a6d7a5..56b405a7e9 100644
--- a/audio/filter/af_convert24.c
+++ b/audio/filter/af_convert24.c
@@ -126,11 +126,8 @@ static int af_open(struct af_instance *af)
}
struct af_info af_info_convert24 = {
- "Convert between 24 and 32 bit sample format",
- "convert24",
- "",
- "",
- 0,
- af_open,
+ .info = "Convert between 24 and 32 bit sample format",
+ .name = "convert24",
+ .open = af_open,
.test_conversion = test_conversion,
};
diff --git a/audio/filter/af_convertsignendian.c b/audio/filter/af_convertsignendian.c
index c5e0004a50..bfea004bb2 100644
--- a/audio/filter/af_convertsignendian.c
+++ b/audio/filter/af_convertsignendian.c
@@ -123,11 +123,8 @@ static int af_open(struct af_instance *af)
}
struct af_info af_info_convertsignendian = {
- "Convert between sample format sign/endian",
- "convertsignendian",
- "",
- "",
- 0,
- af_open,
+ .info = "Convert between sample format sign/endian",
+ .name = "convertsignendian",
+ .open = af_open,
.test_conversion = test_conversion,
};
diff --git a/audio/filter/af_delay.c b/audio/filter/af_delay.c
index eb3e9e19cb..5c34e33a92 100644
--- a/audio/filter/af_delay.c
+++ b/audio/filter/af_delay.c
@@ -3,6 +3,8 @@
* channels and can be used for simple position panning.
* An extension for this filter would be a reverb.
*
+ * Original author: Anders
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -188,10 +190,7 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_delay = {
- "Delay audio filter",
- "delay",
- "Anders",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "Delay audio filter",
+ .name = "delay",
+ .open = af_open,
};
diff --git a/audio/filter/af_drc.c b/audio/filter/af_drc.c
index e293f7f616..c0f7b5beca 100644
--- a/audio/filter/af_drc.c
+++ b/audio/filter/af_drc.c
@@ -339,10 +339,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_drc = {
- "Dynamic range compression filter",
- "drc",
- "Alex Beregszaszi & Pierre Lombard",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Dynamic range compression filter",
+ .name = "drc",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_dummy.c b/audio/filter/af_dummy.c
index 5a54cdd80c..03c9aa9e99 100644
--- a/audio/filter/af_dummy.c
+++ b/audio/filter/af_dummy.c
@@ -2,6 +2,8 @@
* The name speaks for itself. This filter is a dummy and will
* not blow up regardless of what you do with it.
*
+ * Original author: Anders
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -67,10 +69,7 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_dummy = {
- "dummy",
- "dummy",
- "Anders",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "dummy",
+ .name = "dummy",
+ .open = af_open,
};
diff --git a/audio/filter/af_equalizer.c b/audio/filter/af_equalizer.c
index 6441b9b116..8bc1507584 100644
--- a/audio/filter/af_equalizer.c
+++ b/audio/filter/af_equalizer.c
@@ -213,10 +213,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_equalizer = {
- "Equalizer audio filter",
- "equalizer",
- "Anders",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Equalizer audio filter",
+ .name = "equalizer",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index c276d1c3e8..45143075a1 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -7,6 +7,8 @@
* the area changes),
* the rest is payload (non-interleaved).
*
+ * Authors: Anders; Gustavo Sverzut Barbieri <gustavo.barbieri@ic.unicamp.br>
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -270,10 +272,7 @@ static int af_open( struct af_instance* af )
// Description of this filter
struct af_info af_info_export = {
- "Sound export filter",
- "export",
- "Anders; Gustavo Sverzut Barbieri <gustavo.barbieri@ic.unicamp.br>",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "Sound export filter",
+ .name = "export",
+ .open = af_open,
};
diff --git a/audio/filter/af_extrastereo.c b/audio/filter/af_extrastereo.c
index ed1fd27898..75570c7648 100644
--- a/audio/filter/af_extrastereo.c
+++ b/audio/filter/af_extrastereo.c
@@ -139,10 +139,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_extrastereo = {
- "Increase difference between audio channels",
- "extrastereo",
- "Alex Beregszaszi & Pierre Lombard",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Increase difference between audio channels",
+ .name = "extrastereo",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c
index 116a039a04..642ef927bb 100644
--- a/audio/filter/af_format.c
+++ b/audio/filter/af_format.c
@@ -128,12 +128,9 @@ static int af_open(struct af_instance *af)
#define OPT_BASE_STRUCT struct priv
struct af_info af_info_format = {
- "Force audio format",
- "format",
- "",
- "",
- 0,
- af_open,
+ .info = "Force audio format",
+ .name = "format",
+ .open = af_open,
.priv_size = sizeof(struct priv),
.options = (const struct m_option[]) {
OPT_AUDIOFORMAT("format", in_format, 0),
diff --git a/audio/filter/af_hrtf.c b/audio/filter/af_hrtf.c
index 85e6477b31..5b80bf0eec 100644
--- a/audio/filter/af_hrtf.c
+++ b/audio/filter/af_hrtf.c
@@ -3,6 +3,8 @@
* encoded rear channels into headphone signal using FIR filtering
* with HRTF.
*
+ * Author: ylai
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -660,10 +662,7 @@ static int af_open(struct af_instance* af)
/* Description of this filter */
struct af_info af_info_hrtf = {
- "HRTF Headphone",
- "hrtf",
- "ylai",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "HRTF Headphone",
+ .name = "hrtf",
+ .open = af_open,
};
diff --git a/audio/filter/af_karaoke.c b/audio/filter/af_karaoke.c
index faed389625..b24ba0d877 100644
--- a/audio/filter/af_karaoke.c
+++ b/audio/filter/af_karaoke.c
@@ -87,10 +87,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_karaoke = {
- "Simple karaoke/voice-removal audio filter",
- "karaoke",
- "Reynaldo H. Verdejo Pinochet",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Simple karaoke/voice-removal audio filter",
+ .name = "karaoke",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_ladspa.c b/audio/filter/af_ladspa.c
index 5e516f060e..73b7430201 100644
--- a/audio/filter/af_ladspa.c
+++ b/audio/filter/af_ladspa.c
@@ -103,12 +103,9 @@ static int af_ladspa_malloc_failed(char*);
/* Description */
struct af_info af_info_ladspa = {
- "LADSPA plugin loader",
- "ladspa",
- "Ivo van Poorten",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "LADSPA plugin loader",
+ .name = "ladspa",
+ .open = af_open,
};
/* ------------------------------------------------------------------------- */
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index 5371f7aa7d..cd3548ea8f 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -379,10 +379,7 @@ static int af_open(struct af_instance* af){
}
struct af_info af_info_lavcac3enc = {
- "runtime encode to ac3 using libavcodec",
- "lavcac3enc",
- "Ulion",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "runtime encode to ac3 using libavcodec",
+ .name = "lavcac3enc",
+ .open = af_open,
};
diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index 6b8a66d326..3c6d981f1d 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -307,12 +307,9 @@ static int af_open(struct af_instance *af)
#define OPT_BASE_STRUCT struct priv
struct af_info af_info_lavfi = {
- "libavfilter bridge",
- "lavfi",
- "",
- "",
- 0,
- af_open,
+ .info = "libavfilter bridge",
+ .name = "lavfi",
+ .open = af_open,
.priv_size = sizeof(struct priv),
.options = (const struct m_option[]) {
OPT_STRING("graph", cfg_graph, 0),
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 142eb35e6a..0c2d20b8aa 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -3,6 +3,7 @@
* Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com>
*
* This file is part of mpv.
+ * Based on Michael Niedermayer's lavcresample.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -370,12 +371,9 @@ static int af_open(struct af_instance *af)
#define OPT_BASE_STRUCT struct af_resample
struct af_info af_info_lavrresample = {
- "Sample frequency conversion using libavresample",
- "lavrresample",
- "Stefano Pigozzi (based on Michael Niedermayer's lavcresample)",
- "",
- AF_FLAGS_REENTRANT,
- af_open,
+ .info = "Sample frequency conversion using libavresample",
+ .name = "lavrresample",
+ .open = af_open,
.test_conversion = test_conversion,
.priv_size = sizeof(struct af_resample),
.priv_defaults = &(const struct af_resample) {
diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c
index d6f7538868..bbd754647a 100644
--- a/audio/filter/af_pan.c
+++ b/audio/filter/af_pan.c
@@ -205,10 +205,7 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_pan = {
- "Panning audio filter",
- "pan",
- "Anders",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "Panning audio filter",
+ .name = "pan",
+ .open = af_open,
};
diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index dfc830799b..532c563f97 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -507,12 +507,9 @@ static int af_open(struct af_instance* af){
#define OPT_BASE_STRUCT af_scaletempo_t
struct af_info af_info_scaletempo = {
- "Scale audio tempo while maintaining pitch",
- "scaletempo",
- "Robert Juliano",
- "",
- AF_FLAGS_REENTRANT,
- af_open,
+ .info = "Scale audio tempo while maintaining pitch",
+ .name = "scaletempo",
+ .open = af_open,
.priv_size = sizeof(af_scaletempo_t),
.priv_defaults = &(const af_scaletempo_t) {
.ms_stride = 60,
diff --git a/audio/filter/af_sinesuppress.c b/audio/filter/af_sinesuppress.c
index 10f0b650ec..b9c86ccfe9 100644
--- a/audio/filter/af_sinesuppress.c
+++ b/audio/filter/af_sinesuppress.c
@@ -162,10 +162,7 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_sinesuppress = {
- "Sine Suppress",
- "sinesuppress",
- "Michael Niedermayer",
- "",
- 0,
- af_open
+ .info = "Sine Suppress",
+ .name = "sinesuppress",
+ .open = af_open,
};
diff --git a/audio/filter/af_sub.c b/audio/filter/af_sub.c
index a985ac2a05..6fd492db95 100644
--- a/audio/filter/af_sub.c
+++ b/audio/filter/af_sub.c
@@ -178,10 +178,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_sub = {
- "Audio filter for adding a sub-base channel",
- "sub",
- "Anders",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Audio filter for adding a sub-base channel",
+ .name = "sub",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_surround.c b/audio/filter/af_surround.c
index c04a039d65..25218c1b05 100644
--- a/audio/filter/af_surround.c
+++ b/audio/filter/af_surround.c
@@ -262,10 +262,8 @@ static int af_open(struct af_instance* af){
struct af_info af_info_surround =
{
- "Surround decoder filter",
- "surround",
- "Steve Davies <steve@daviesfam.org>",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Surround decoder filter",
+ .name = "surround",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};
diff --git a/audio/filter/af_sweep.c b/audio/filter/af_sweep.c
index 6cc099f2d8..0a140dcb65 100644
--- a/audio/filter/af_sweep.c
+++ b/audio/filter/af_sweep.c
@@ -92,10 +92,7 @@ static int af_open(struct af_instance* af){
}
struct af_info af_info_sweep = {
- "sine sweep",
- "sweep",
- "Michael Niedermayer",
- "",
- AF_FLAGS_REENTRANT,
- af_open
+ .info = "sine sweep",
+ .name = "sweep",
+ .open = af_open,
};
diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c
index a766b97ec6..f1c4ede569 100644
--- a/audio/filter/af_volume.c
+++ b/audio/filter/af_volume.c
@@ -199,10 +199,8 @@ static int af_open(struct af_instance* af){
// Description of this filter
struct af_info af_info_volume = {
- "Volume control audio filter",
- "volume",
- "Anders",
- "",
- AF_FLAGS_NOT_REENTRANT,
- af_open
+ .info = "Volume control audio filter",
+ .name = "volume",
+ .flags = AF_FLAGS_NOT_REENTRANT,
+ .open = af_open,
};