summaryrefslogtreecommitdiff
path: root/vpxdec.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-09-11 16:55:19 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-09-11 18:37:24 -0400
commiteba342af878240a47b4d5e97657724d47f303e5b (patch)
tree4f467752c8995d65fbd8d622a5ae9e69d9d54e87 /vpxdec.c
parent812fbc5ecb014b8f3f4b95a23144821edc2a2eab (diff)
downloadlibvpx-eba342af878240a47b4d5e97657724d47f303e5b.tar
libvpx-eba342af878240a47b4d5e97657724d47f303e5b.tar.gz
libvpx-eba342af878240a47b4d5e97657724d47f303e5b.tar.bz2
libvpx-eba342af878240a47b4d5e97657724d47f303e5b.zip
Don't convert bitdepth for !single-file or MD5.
... unless --output-bit-depth was set. Change-Id: I3482eaf12e245eec24427518fccdd173f890f4b4
Diffstat (limited to 'vpxdec.c')
-rw-r--r--vpxdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vpxdec.c b/vpxdec.c
index 3c61bd92c..9964b9a69 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -990,11 +990,11 @@ static int main_loop(int argc, const char **argv_) {
}
#if CONFIG_VP9_HIGHBITDEPTH
// Default to codec bit depth if output bit depth not set
- if (!output_bit_depth) {
+ if (!output_bit_depth && single_file && !do_md5) {
output_bit_depth = img->bit_depth;
}
// Shift up or down if necessary
- if (output_bit_depth != img->bit_depth) {
+ if (output_bit_depth != 0 && output_bit_depth != img->bit_depth) {
const vpx_img_fmt_t shifted_fmt = output_bit_depth == 8 ?
img->fmt ^ (img->fmt & VPX_IMG_FMT_HIGHBITDEPTH) :
img->fmt | VPX_IMG_FMT_HIGHBITDEPTH;