diff options
author | Yaowu Xu <yaowu@google.com> | 2016-02-09 16:57:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-09 16:57:28 +0000 |
commit | bb8eebc0e09969881968fcc411e5a00d2ec6e6fa (patch) | |
tree | abc02522e6edebb7583cc2c4eb5000d0fb84952b | |
parent | 29e211886f2e2abfd88bb6fb3e82cb471847e93d (diff) | |
parent | 5c327cb4506233c422c719f5a5e8c03d1f064b79 (diff) | |
download | libvpx-bb8eebc0e09969881968fcc411e5a00d2ec6e6fa.tar libvpx-bb8eebc0e09969881968fcc411e5a00d2ec6e6fa.tar.gz libvpx-bb8eebc0e09969881968fcc411e5a00d2ec6e6fa.tar.bz2 libvpx-bb8eebc0e09969881968fcc411e5a00d2ec6e6fa.zip |
Merge "Set use_highbitdepth flag to either 1 or 0"
-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 8a46738cd..6ea8dbf1b 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -4141,7 +4141,7 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags, 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); |