Merge "ext-intra: speed up keyframe encoding" into nextgenv2