shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix a warning related to VPX_EFLAG_FORCE_KF check"

--- 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);

       }