libx264 support
Merge branch 'master' of https://github.com/wagok/ffmpeglib