version bump ffmpeg-2.5
Merge remote-tracking branch 'Duckbox-Developers/master'