Merge "vp9_rdopt.c static analysis issues resolved"