x264: r2412 in stable and r2431 in devel

In addition, the patch became unnecessary.