* commit '182d3f82':
  output example: rewrite encoding logic

Conflicts:
	doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>