Merge changes I9d4c1af5,I882da3a0
authorLinfeng Zhang <linfengz@google.com>
Tue, 10 Oct 2017 17:29:50 +0000 (17:29 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 10 Oct 2017 17:29:50 +0000 (17:29 +0000)
* changes:
  Rename some inline functions in NEON scaling
  Generalize 2:1 vp9_scale_and_extend_frame_ssse3()


Trivial merge