Make av_get_channel_layout_string() guess the number of channels if it was not provided.
Originally committed as revision 26324 to svn://svn.ffmpeg.org/ffmpeg/trunk