Commit 055257a2 authored by Max Kellermann's avatar Max Kellermann

audio-parser, output_thread: work around -Wmaybe-uninitialized

False positives in gcc 4.7.
parent 50cfb997
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "audio_parser.h" #include "audio_parser.h"
#include "audio_format.h" #include "audio_format.h"
#include "audio_check.h" #include "audio_check.h"
#include "gcc.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
...@@ -160,6 +161,11 @@ audio_format_parse(struct audio_format *dest, const char *src, ...@@ -160,6 +161,11 @@ audio_format_parse(struct audio_format *dest, const char *src,
/* parse sample rate */ /* parse sample rate */
#if GCC_CHECK_VERSION(4,7)
/* workaround -Wmaybe-uninitialized false positive */
rate = 0;
#endif
if (!parse_sample_rate(src, mask, &rate, &src, error_r)) if (!parse_sample_rate(src, mask, &rate, &src, error_r))
return false; return false;
...@@ -171,6 +177,11 @@ audio_format_parse(struct audio_format *dest, const char *src, ...@@ -171,6 +177,11 @@ audio_format_parse(struct audio_format *dest, const char *src,
/* parse sample format */ /* parse sample format */
#if GCC_CHECK_VERSION(4,7)
/* workaround -Wmaybe-uninitialized false positive */
sample_format = SAMPLE_FORMAT_UNDEFINED;
#endif
if (!parse_sample_format(src, mask, &sample_format, &src, error_r)) if (!parse_sample_format(src, mask, &sample_format, &src, error_r))
return false; return false;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "filter/convert_filter_plugin.h" #include "filter/convert_filter_plugin.h"
#include "filter/replay_gain_filter_plugin.h" #include "filter/replay_gain_filter_plugin.h"
#include "mpd_error.h" #include "mpd_error.h"
#include "gcc.h"
#include <glib.h> #include <glib.h>
...@@ -438,6 +439,10 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk) ...@@ -438,6 +439,10 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
} }
size_t size; size_t size;
#if GCC_CHECK_VERSION(4,7)
/* workaround -Wmaybe-uninitialized false positive */
size = 0;
#endif
const char *data = ao_filter_chunk(ao, chunk, &size); const char *data = ao_filter_chunk(ao, chunk, &size);
if (data == NULL) { if (data == NULL) {
ao_close(ao, false); ao_close(ao, false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment