diff options
author | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
commit | 0c9fc2f8090ed225c76296088e6760630eb42779 (patch) | |
tree | 9238436fb89ebf6a91d329eba0f5feec1ad137fd /src/output/ao_plugin.c | |
parent | 1a954748a027aa5b4fc6c85b0ad96c2fa25d53b8 (diff) | |
parent | fe588a255ba713875a21bb98d3b7daf60af2844e (diff) | |
download | mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.gz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.xz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.zip |
Merge commit 'release-0.16.2'
Conflicts:
Makefile.am
NEWS
configure.ac
Diffstat (limited to 'src/output/ao_plugin.c')
-rw-r--r-- | src/output/ao_plugin.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c index 21d60eb58..71e06bad9 100644 --- a/src/output/ao_plugin.c +++ b/src/output/ao_plugin.c @@ -26,6 +26,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 { @@ -167,7 +170,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; switch (audio_format->format) { |