diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-12-02 14:03:55 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-02 14:03:55 -0800 |
| commit | 1fbe0c761591b96511fcdb6cf0a5ce5c86e21bd0 (patch) | |
| tree | 5ccd8219fcb0354aa51812ef43790cfbd80277e2 /vp9/encoder | |
| parent | dcb29c14063e37d9a54d27c637e7b21577c092aa (diff) | |
| parent | 02941b0df2c669a669aa23b328e7f103e164e0fe (diff) | |
| download | libvpx-1fbe0c761591b96511fcdb6cf0a5ce5c86e21bd0.tar libvpx-1fbe0c761591b96511fcdb6cf0a5ce5c86e21bd0.tar.gz libvpx-1fbe0c761591b96511fcdb6cf0a5ce5c86e21bd0.tar.bz2 libvpx-1fbe0c761591b96511fcdb6cf0a5ce5c86e21bd0.zip | |
Merge "Fix a warning related to VPX_EFLAG_FORCE_KF check"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |