Merge "vp9_ratectrl.h resolve visual studio warnings"