Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 21:28:36 +0000 (23:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 21:37:07 +0000 (23:37 +0200)
* commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a':
  output example: convert audio to the format supported by the encoder

Conflicts:
doc/examples/muxing.c

Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.

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

Trivial merge