Start of supporting HDV over firewire.
Fix merge conflicts and update