ffmpeg 2.1.3
Merge pull request #28 from KG7x/patch-4

Update to ffmpeg 2.1.3