extra/ffmpeg to 2.2.4-3
Merge pull request #896 from davidbeauchamp/master

extra/ffmpeg to 2.2.4-3