diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-02 21:33:14 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-02 21:33:14 -0800 |
| commit | e2327b7afb206002902127b7de3191ef5bc0a86a (patch) | |
| tree | c86ad82ef7b406facaffce078ae71650236d8e6b /include/uapi | |
| parent | e3a533c91175cfa56e183798e5078544b93aeef1 (diff) | |
| parent | 37245e8b296ed02dd17da7304720342f8163f093 (diff) | |
Merge "msm: vidc: Correct enum value for vpx colorspace extradata"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/media/msm_vidc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/media/msm_vidc.h b/include/uapi/media/msm_vidc.h index b259bdef8a93..e9370cb660b2 100644 --- a/include/uapi/media/msm_vidc.h +++ b/include/uapi/media/msm_vidc.h @@ -245,7 +245,7 @@ enum msm_vidc_extradata_type { MSM_VIDC_EXTRADATA_DIGITAL_ZOOM = 0x07000010, #define MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO \ MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO - MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO = 0x070000011, + MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO = 0x00000014, MSM_VIDC_EXTRADATA_MULTISLICE_INFO = 0x7F100000, MSM_VIDC_EXTRADATA_NUM_CONCEALED_MB = 0x7F100001, MSM_VIDC_EXTRADATA_INDEX = 0x7F100002, |