Merge branch 'v0.15.x'

Conflicts:
	src/decoder/ffmpeg_plugin.c

1 files changed, 2 insertions, 0 deletions

diff --git a/src/mapper.h b/src/mapper.h
index d63243ff..12108cbe 100644
--- a/src/mapper.h
+++ b/src/mapper.h
@@ -99,6 +99,8 @@ map_spl_path(void);
  * Maps a playlist name (without the ".m3u" suffix) to a file system
  * path.  The return value is allocated on the heap and must be freed
  * with g_free().
+ *
+ * @return the path in file system encoding, or NULL if mapping failed
  */
 char *
 map_spl_utf8_to_fs(const char *name);