commit 66b1fcc92402a2bed05040bce6ecda42178d2f61
author Urvang Joshi <urvang@google.com> Wed Oct 19 18:25:52 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 19 18:25:52 2016 +0000
tree 54cad486b22023c98d7622b1c90338c6c5e69ba3
parent 3e908b7f444bcbe2a8011b0e763dad016f5229a5
parent 4145bf05ae1fae259593ef8f025795d77db5a4fc

Merge changes I3922dea2,I3bab2848,I21f7478a,Ida5de713,Ib9f0eefe, ... into nextgenv2

* changes:
  Fix warnings reported by -Wshadow: Part4: main directory
  Fix warnings reported by -Wshadow: Part3: test/ directory
  Fix warnings reported by -Wshadow: Part2b: more from av1 directory
  Fix warnings reported by -Wshadow: Part2: av1 directory
  Fix warnings reported by -Wshadow: Part1b: scan_order struct and variable
  Fix warnings reported by -Wshadow: Part1: aom_dsp directory
  Move STAT_TYPE enum to source file.
  Code cleanup: mainly rd_pick_partition and methods called from there.