Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'

* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/examples/muxing.c

@@ -34,6 +34,7 @@
 #include <string.h>
 #include <math.h>
 
+#include <libavutil/channel_layout.h>
 #include <libavutil/opt.h>
 #include <libavutil/mathematics.h>
 #include <libavutil/timestamp.h>
@@ -109,6 +110,7 @@ static AVStream *add_stream(OutputStream *ost, AVFormatContext *oc,
         c->bit_rate    = 64000;
         c->sample_rate = 44100;
         c->channels    = 2;
+        c->channel_layout = AV_CH_LAYOUT_STEREO;
         break;
 
     case AVMEDIA_TYPE_VIDEO: