Merge "vp9_mcomp.c visual studio warnings resolved"