Merge "vp10: don't allow comp_inter_inter on keyframes."
authorRonald S. Bultje <rsbultje@gmail.com>
Thu, 22 Oct 2015 21:14:00 +0000 (21:14 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 22 Oct 2015 21:14:00 +0000 (21:14 +0000)

Trivial merge