ffmpeg 2.1
Merge pull request #5 from smitranic/ffmpeg

ffmpeg 2.1