diff options
author | Max Kellermann <max@duempel.org> | 2012-04-05 00:45:39 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2012-04-05 00:45:39 +0200 |
commit | c22cbbf8280bb35c8fee5ae3931d3bc08b70099f (patch) | |
tree | 4654b9834f51c32746e2f72ce64191149647d87e /src/output/shout_output_plugin.c | |
parent | f930f37d35995f0fc07f70aefc41babc0db1757e (diff) | |
parent | 5acee73fc85e44179120a5818247fc0760038cff (diff) | |
download | mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.gz mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.xz mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.zip |
Merge branch 'v0.16.x'
Conflicts:
src/output/osx_plugin.c
src/text_input_stream.c
Diffstat (limited to 'src/output/shout_output_plugin.c')
-rw-r--r-- | src/output/shout_output_plugin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/output/shout_output_plugin.c b/src/output/shout_output_plugin.c index 35356d659..7867ae63c 100644 --- a/src/output/shout_output_plugin.c +++ b/src/output/shout_output_plugin.c @@ -376,7 +376,7 @@ static void close_shout_conn(struct shout_data * sd) sd->buf.len = 0; if (sd->encoder != NULL) { - if (encoder_flush(sd->encoder, NULL)) + if (encoder_end(sd->encoder, NULL)) write_page(sd, NULL); encoder_close(sd->encoder); |