diff --git a/libavcore/audioconvert.c b/libavcore/audioconvert.c
index 171d6b1365..c7207338a4 100644
--- a/libavcore/audioconvert.c
+++ b/libavcore/audioconvert.c
@@ -78,6 +78,9 @@ void av_get_channel_layout_string(char *buf, int buf_size,
 {
     int i;
 
+    if (nb_channels <= 0)
+        nb_channels = av_get_channel_layout_nb_channels(channel_layout);
+
     for (i = 0; channel_layout_map[i].name; i++)
         if (nb_channels    == channel_layout_map[i].nb_channels &&
             channel_layout == channel_layout_map[i].layout) {
diff --git a/libavcore/audioconvert.h b/libavcore/audioconvert.h
index 0c6b979aec..89e9c55d17 100644
--- a/libavcore/audioconvert.h
+++ b/libavcore/audioconvert.h
@@ -80,6 +80,7 @@ int64_t av_get_channel_layout(const char *name);
 
 /**
  * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
  *
  * @param buf put here the string containing the channel layout
  * @param buf_size size in bytes of the buffer
diff --git a/libavcore/avcore.h b/libavcore/avcore.h
index 714eac4bbf..9b02c3b58c 100644
--- a/libavcore/avcore.h
+++ b/libavcore/avcore.h
@@ -28,7 +28,7 @@
 
 #define LIBAVCORE_VERSION_MAJOR  0
 #define LIBAVCORE_VERSION_MINOR 16
-#define LIBAVCORE_VERSION_MICRO  0
+#define LIBAVCORE_VERSION_MICRO  1
 
 #define LIBAVCORE_VERSION_INT   AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
                                                LIBAVCORE_VERSION_MINOR, \