aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--src/output/ao_plugin.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 313a5c621..76571d0f0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.15.16 (2010/??/??)
+* output:
+ - ao: initialize the ao_sample_format struct
* encoders:
- lame: explicitly configure the output sample rate
* update: log all file permission problems
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c
index 12d2b7552..63a43ddf0 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -25,6 +25,9 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "ao"
+/* An ao_sample_format, with all fields set to zero: */
+static const ao_sample_format OUR_AO_FORMAT_INITIALIZER;
+
static unsigned ao_output_ref;
struct ao_data {
@@ -166,7 +169,7 @@ static bool
ao_output_open(void *data, struct audio_format *audio_format,
GError **error)
{
- ao_sample_format format;
+ ao_sample_format format = OUR_AO_FORMAT_INITIALIZER;
struct ao_data *ad = (struct ao_data *)data;
/* support for 24 bit samples in libao is currently dubious,