add ffmpeg
git push origin masterMerge branch 'master' of
https://github.com/hamko/initial_settings