Remove {virtual,media-video}/ffmpeg keywords
Merge branch 'stage' into media