Merge "Fix compiler warnings in rdopt when warped motion is enabled" into nextgenv2