Merge pull request #7396 from thess/ffmpeg-x264