Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 21:20:54 +0000 (23:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 21:22:08 +0000 (23:22 +0200)
commit5a55d5e44575ea70c20dfea108c8cc038e1463c5
tree3c99bcb9164c616b855381c39eb489d85ce0b5d7
parentb9bfd888e551644c54971220ebf1f37effba4769
parent63fd0d866c8300a8f251a15b1535e9ce40a407fb
Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'

* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
  output example: allocate the audio frame only once

Conflicts:
doc/examples/muxing.c

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