x264: remove merge error

Fixes #240.