diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-16 18:08:54 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-16 18:08:54 +0100 |
| commit | 6dcec366214da4238819914985e4921e258ba324 (patch) | |
| tree | 5d13492cdd62fccd7e380b5511262c66a9fdb999 /src/output/ao_plugin.c | |
| parent | e2aea6bce581e09e20f7570fd67cb92896f60656 (diff) | |
| parent | 4d4b7e3de076ed8cf4a4d1e780a43d777221a125 (diff) | |
| download | mpd-6dcec366214da4238819914985e4921e258ba324.tar.gz mpd-6dcec366214da4238819914985e4921e258ba324.tar.xz mpd-6dcec366214da4238819914985e4921e258ba324.zip | |
Merge release 0.15.16 into v0.16.x
Conflicts:
NEWS
configure.ac
src/output/jack_plugin.c
src/update.c
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 d5c95018c..6fedbc6e2 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) { |