commit bb8eebc0e09969881968fcc411e5a00d2ec6e6fa
author Yaowu Xu <yaowu@google.com> Tue Feb 09 16:57:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 09 16:57:28 2016 +0000
tree abc02522e6edebb7583cc2c4eb5000d0fb84952b
parent 29e211886f2e2abfd88bb6fb3e82cb471847e93d
parent 5c327cb4506233c422c719f5a5e8c03d1f064b79

Merge "Set use_highbitdepth flag to either 1 or 0"

vp9/encoder/vp9_encoder.c

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 8a46738..6ea8dbf 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -4141,7 +4141,7 @@
   const int subsampling_x = sd->subsampling_x;
   const int subsampling_y = sd->subsampling_y;
 #if CONFIG_VP9_HIGHBITDEPTH
-  const int use_highbitdepth = sd->flags & YV12_FLAG_HIGHBITDEPTH;
+  const int use_highbitdepth = (sd->flags & YV12_FLAG_HIGHBITDEPTH) != 0;
   check_initial_width(cpi, use_highbitdepth, subsampling_x, subsampling_y);
 #else
   check_initial_width(cpi, subsampling_x, subsampling_y);