Michael Niedermayer a1c4635558 Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'
* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 22:13:46 +02:00
..
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-06-18 14:55:28 +02:00
2014-05-28 03:52:50 +02:00
2014-06-20 10:21:31 -08:00