Added ffmpeg via multimedia repository.
Merge remote-tracking branch 'origin/master' into greystone