* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38': output example: use the new AVFrame API to allocate audio frames Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>