Match audio to audio instead of video to audio

[vr2262]

This simplifies a number of things, makes things faster, and probably gives better results.

Thanks @myf