aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-02-13 19:15:18 +0100
committerMax Kellermann <max@duempel.org>2012-02-13 19:15:18 +0100
commitc616165f81a07feb42b96b6078885b2a10c8908f (patch)
treed21c8c77c007e6de0bf50c6daf8f5998d8d978fd /src/output
parentedac498d03b9de59d4e55081c92604ff2447a298 (diff)
parent103832742d4ef2b6bb86d287b8557ab3e64dba21 (diff)
downloadmpd-c616165f81a07feb42b96b6078885b2a10c8908f.tar.gz
mpd-c616165f81a07feb42b96b6078885b2a10c8908f.tar.xz
mpd-c616165f81a07feb42b96b6078885b2a10c8908f.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac src/decoder/ffmpeg_decoder_plugin.c test/read_tags.c
Diffstat (limited to 'src/output')
-rw-r--r--src/output/winmm_output_plugin.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/output/winmm_output_plugin.c b/src/output/winmm_output_plugin.c
index 47d98498f..ed0f7f2d4 100644
--- a/src/output/winmm_output_plugin.c
+++ b/src/output/winmm_output_plugin.c
@@ -224,11 +224,7 @@ winmm_set_buffer(struct winmm_output *wo, struct winmm_buffer *buffer,
GError **error_r)
{
void *dest = pcm_buffer_get(&buffer->buffer, size);
- if (dest == NULL) {
- g_set_error(error_r, winmm_output_quark(), 0,
- "Out of memory");
- return false;
- }
+ assert(dest != NULL);
memcpy(dest, data, size);