honestly, your avi was fine. It's the codec inside that matters. But if you MUST know, you can use mkvmerge to combine any number of audio and video streams into an mkv container. Or use avidemux.
FYI, I'll probably make Federer vs. Djokovic Rome highlights.