Merge pull request #57 from hdansou/master

Added ffmpeg