-
Michael Niedermayer authored
* commit 'edd5f957': output example: use OutputStream for audio streams as well Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b9bfd888
* commit 'edd5f957': output example: use OutputStream for audio streams as well Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>