commit 02941b0df2c669a669aa23b328e7f103e164e0fe
author Deb Mukherjee <debargha@google.com> Tue Dec 02 11:35:52 2014 -0800
committer Deb Mukherjee <debargha@google.com> Tue Dec 02 11:35:52 2014 -0800
tree 4590b9b8b9b8f48da5580ce33ac880c3911b9ed7
parent 03e267155b799fe01a0069925df7ee905e2535f8

Fix a warning related to VPX_EFLAG_FORCE_KF check

Fixes a warning in chrome build.

Change-Id: I8fa0fd3e7ba1aecf89e5f79ce94cd64ed6a9567c

vp9/encoder/vp9_encoder.c

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 28350ef..e82d5d8 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3642,7 +3642,7 @@
       // non-zero spatial layer, it should not be an intra picture.
       // TODO(Won Kap): this needs to change if per-layer intra frame is
       // allowed.
-      if ((source->flags | VPX_EFLAG_FORCE_KF) && cpi->svc.spatial_layer_id) {
+      if ((source->flags & VPX_EFLAG_FORCE_KF) && cpi->svc.spatial_layer_id) {
         source->flags &= ~(unsigned int)(VPX_EFLAG_FORCE_KF);
       }