diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-20 02:38:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-20 02:38:07 -0700 |
| commit | c48c535a725f154191e85bb20f808ad7faa08051 (patch) | |
| tree | a429c38e8ffadd202a00383662f255314227225c /drivers/media/platform | |
| parent | 1f9a2cdec9bc559b0691b614759b882acf8b4de6 (diff) | |
| parent | 98f28d031d1b594c4d8feb8745d49920daf4ed7c (diff) | |
Merge "msm: vidc: Addition of enums for HLG and HDR10"
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_venc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_venc.c b/drivers/media/platform/msm/vidc/msm_venc.c index ebdafd66e590..3f06dd6ac4b5 100644 --- a/drivers/media/platform/msm/vidc/msm_venc.c +++ b/drivers/media/platform/msm/vidc/msm_venc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1394,7 +1394,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { .name = "Set Color space transfer characterstics", .type = V4L2_CTRL_TYPE_INTEGER, .minimum = MSM_VIDC_TRANSFER_BT709_5, - .maximum = MSM_VIDC_TRANSFER_BT_2020_12, + .maximum = MSM_VIDC_TRANSFER_HLG, .default_value = MSM_VIDC_TRANSFER_601_6_625, .step = 1, .qmenu = NULL, |