tree 68da230ccfcc269a69ac8e83d4fb3df58184680e
parent 4be3214fecf0cf371183ab755bc2892f26ae565d
parent 5d54c175c2d3c3d34017ca55d552851971c084ed
author James Zern <jzern@google.com> 1478298851 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1478298851 +0000

Merge changes I139808f4,I3d97d8db into nextgenv2

* changes:
  warped_motion.c: delete unused filter_4tap[]
  warped_motion.c: quiet float-conversion warnings