x264 update
Merge pull request #16 from hadronproject/master

x264 update