Merge "Compound inter-intra experiment" into experimental

diff --cc vp9/common/mvref_common.c
Simple merge

diff --cc vp9/common/onyxc_int.h
Simple merge

diff --cc vp9/common/reconintra.c
Simple merge

diff --cc vp9/decoder/decodemv.c
Simple merge

diff --cc vp9/decoder/decodframe.c
Simple merge

diff --cc vp9/encoder/bitstream.c
index 5f7ed930cec5e6eed221f68eeb5249b5b97c24fe,a71472df3b1bc9e63d40b083d27267bca6e6cae6..ccce910c76de129bc5090864e2a3fd4207a10692
--- 1/vp9/encoder/bitstream.c
--- 2/vp9/encoder/bitstream.c
+++ b/vp9/encoder/bitstream.c
@@@ -972,8 -990,9 +987,8 @@@ static void pack_inter_mode_mvs(VP9_COM
              }
            }
  
-           if (mi->second_ref_frame &&
+           if (mi->second_ref_frame > 0 &&
                (mode == NEWMV || mode == SPLITMV)) {
 -            int_mv n1, n2;
  
              best_second_mv.as_int =
                mi->ref_mvs[mi->second_ref_frame][0].as_int;

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

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