Merge pull request #4225 from ffainelli/x264