Make ffmpeg and key codecs use master
Update submodules