Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 21:58:00 +0000 (23:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 21:58:00 +0000 (23:58 +0200)
commit877716a79c9d649624b67b1fa328825e2c055cc9
treefd7ef8f7f7919eb819809ca575abcf642950f7d5
parent5a55d5e44575ea70c20dfea108c8cc038e1463c5
parent6a927d7aaf5625e83a674072913b9e292a303fd1
Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'

* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
  output example: use a macro instead of a static variable

Conflicts:
doc/examples/muxing.c

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