I have some MKV files, I'd like to be able to edit them so I can set which audio track is default as a bug in XBMC prevents me from switching the audio track with OGM and MKV files (not an issue with OGM as I just switch back to XBMP which supports them wonderfully), I've tried VirtualDubMod, but it wont read the MKV file, anyone else know of a way?

I just need to switch the audio tracks, nothing else so I'd like to avoid decompressing or anything of the like