-
Michael Niedermayer authored
* commit '63fd0d86': output example: allocate the audio frame only once Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5a55d5e4
* commit '63fd0d86': output example: allocate the audio frame only once Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>