x264: r2412 in stable and r2431 in devel

In addition, the patch became unnecessary because it has been merged to official repo.
See http://git.videolan.org/?p=x264.git;a=commit;h=7cdcfd5c65a90a159f55898abc36a64e13b4735b