Updates ffmpeg call, fixes #111
Merge branch 'develop' with ffmpeg fix