ffmpeg 2.1.4 -> 2.2.1
Merge pull request #2290 from ttuegel/ffmpeg

ffmpeg 2.1.4 -> 2.2.1