From: Deb Mukherjee <debargha@google.com>
Date: Tue, 2 Dec 2014 19:35:52 +0000 (-0800)
Subject: Fix a warning related to VPX_EFLAG_FORCE_KF check
X-Git-Tag: v1.4.0~447^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02941b0df2c669a669aa23b328e7f103e164e0fe;p=libvpx

Fix a warning related to VPX_EFLAG_FORCE_KF check

Fixes a warning in chrome build.

Change-Id: I8fa0fd3e7ba1aecf89e5f79ce94cd64ed6a9567c
---

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 28350ef54..e82d5d8df 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3642,7 +3642,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
       // 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);
       }