Update x264-git to reflect extra changes