Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 20:13:46 +0000 (22:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 20:13:46 +0000 (22:13 +0200)
commita1c4635558cbb0a311022a0c74258118d09d260e
tree877943edca43038403d71175df8ea47cf68f424b
parent8eb1174a9ed35ba2735ec6874b0da87052185c9d
parentac85f631c9a9cc59aaca1c8dd6894fb1f701c594
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