Merge changes I139808f4,I3d97d8db into nextgenv2 * changes: warped_motion.c: delete unused filter_4tap[] warped_motion.c: quiet float-conversion warnings