diff options
author | Max Kellermann <max@duempel.org> | 2011-07-19 00:24:20 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-07-19 00:24:20 +0200 |
commit | eb2f413cf030a8c9ed51d8dc081e51e4afd287fb (patch) | |
tree | 47c1265e07af284e8a2ced6cb968b5359b754274 /src/output/httpd_output_plugin.c | |
parent | e54748d3554d57f8320dff7390fa605bf23d7cd0 (diff) | |
parent | 736fd0e29326548152e91e4e3fb8c0ea9c1b50ac (diff) | |
download | mpd-eb2f413cf030a8c9ed51d8dc081e51e4afd287fb.tar.gz mpd-eb2f413cf030a8c9ed51d8dc081e51e4afd287fb.tar.xz mpd-eb2f413cf030a8c9ed51d8dc081e51e4afd287fb.zip |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to '')
-rw-r--r-- | src/output/httpd_output_plugin.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c index 7fde676c5..20098c90e 100644 --- a/src/output/httpd_output_plugin.c +++ b/src/output/httpd_output_plugin.c @@ -103,6 +103,7 @@ httpd_output_init(G_GNUC_UNUSED const struct audio_format *audio_format, if (encoder_plugin == NULL) { g_set_error(error, httpd_output_quark(), 0, "No such encoder: %s", encoder_name); + g_free(httpd); return NULL; } |