Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 22:50:32 +0000 (00:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 22:57:04 +0000 (00:57 +0200)
commit8469c73576f76a3390cd93455cc4b2fea1d29154
tree3acabb0f5ea951c3003f0940152c00bcd646221f
parent9a2850c26af8fbf4766fd6d6795c6687eab44bbc
parent182d3f8221c23716ea4eafa460bdb94968f71f26
Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'

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

Conflicts:
doc/examples/muxing.c

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