Merge pull request #389 from micmac1/bsip-x264