Fix VP9_mode_order[]

Mis-merge of the following change managed to break mode order
and delete two mode options (new alt ref and near alt ref)
It also created a situation where we could test two undefined
modes off the end of the VP9_mode_order[] data structure.
  "clang warnings : remove split and i4x4_pred fake modes"
  "Change Id: I8ef3c*"

Initial testing on Akiyo at speed 2.
101.35	 44.567	 44.447 improves to
96.82	 44.915	 44.815

Approx 0.3-0.4db gain and 2.5% size reduction

Change-Id: Icff813e7c0778d140ad4f0eea18cf1ed203c4e34

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index cbc8d46..7ba0064 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -60,9 +60,11 @@ const MODE_DEFINITION vp9_mode_order[MAX_MODES] = {
   {RD_DC_PRED,   INTRA_FRAME,  NONE},
 
   {RD_NEWMV,     LAST_FRAME,   NONE},
+  {RD_NEWMV,     ALTREF_FRAME, NONE},
   {RD_NEWMV,     GOLDEN_FRAME, NONE},
 
   {RD_NEARMV,    LAST_FRAME,   NONE},
+  {RD_NEARMV,    ALTREF_FRAME, NONE},
   {RD_NEARESTMV, LAST_FRAME,   ALTREF_FRAME},
   {RD_NEARESTMV, GOLDEN_FRAME, ALTREF_FRAME},