Merge changes I4e2aeaef,Ie3e478ef
authorJim Bankoski <jimbankoski@google.com>
Tue, 5 Aug 2014 15:57:34 +0000 (08:57 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 5 Aug 2014 15:57:34 +0000 (08:57 -0700)
* changes:
  vpxdec warning errors addressed
  cast enums to int to avoid gcc warning in pred_common


Trivial merge