Merge branch 't/id3_conf'

	configure: Add --with-id3tag-headers/libs.
	Link against libz if compiling with libid3tag support.

diff --git a/NEWS b/NEWS
index 5b87555053f907b1226fb1f2867f0d9076206ae9..7c3ac3ce2a9e727f24bf0f5e5829cb1762d7545c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@
        - para_audioc: Cleanups and memory leak fixes.
        - Test 0004-server no longer fails if para_server is not
          being built.
+       - New configure options: --with-id3tag-{headers,libs}.
+
 
 -------------------------------------
 0.4.9 (2011-12-06) "hybrid causality"

diff --git a/mood.c b/mood.c
index 1a572cfa8f1859a946ea34708b48e990a036f5b2..f580400dd52bfe4d129f7526034745929b0cdf7e 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -364,8 +364,10 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
        char *mood_name;
        struct osl_object mood_def;
        struct mood_line_parser_data mlpd = {.line_num = 0};
-       int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
+       int ret;
 
+       *m = NULL;
+       ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
        if (ret < 0)
                return ret;
        if (!*mood_name)