From: Deb Mukherjee <debargha@google.com>
Date: Fri, 16 Nov 2012 16:30:34 +0000 (-0800)
Subject: Merge "Compound inter-intra experiment" into experimental
X-Git-Tag: v1.3.0~1217^2~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb2d06ceac458255d00c18d49592a4ab55ff5c35;p=libvpx

Merge "Compound inter-intra experiment" into experimental
---

cb2d06ceac458255d00c18d49592a4ab55ff5c35
diff --cc vp9/encoder/bitstream.c
index 5f7ed930c,a71472df3..ccce910c7
--- a/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;