projects
/
platform
/
upstream
/
libvpx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
03e2671
)
Fix a warning related to VPX_EFLAG_FORCE_KF check
author
Deb Mukherjee
<debargha@google.com>
Tue, 2 Dec 2014 19:35:52 +0000
(11:35 -0800)
committer
Deb Mukherjee
<debargha@google.com>
Tue, 2 Dec 2014 19:35:52 +0000
(11:35 -0800)
Fixes a warning in chrome build.
Change-Id: I8fa0fd3e7ba1aecf89e5f79ce94cd64ed6a9567c
vp9/encoder/vp9_encoder.c
patch
|
blob
|
history
diff --git
a/vp9/encoder/vp9_encoder.c
b/vp9/encoder/vp9_encoder.c
index
28350ef
..
e82d5d8
100644
(file)
--- 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);
}