Merge pull request #11485 from BKPepe/x264