Merge "yv12extend: name variables consistently"