[x264] (2 commits) ...Fix detection of gpac try 2