Merge https://github.com/lukaszmluki/ffmpeg