Add the option to mix video and audio from two different streams in ffmpeg proxy
Fix a little typo