Merge changes I24ad1f0f,I33be1366

* changes:
  Reorder functions to avoid forward declaration
  Rename set_scale_factors as set_ref_ptrs

diff --cc vp9/encoder/vp9_firstpass.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge