Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c7f5a92 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Correct enum value for vpx colorspace extradata" into msm-4.9

parents afe18bb1 e7a8e842

include/uapi/media/msm_vidc.h

+3 −3
Original line number Diff line number Diff line
@@ -238,6 +238,9 @@ enum msm_vidc_extradata_type { 
	MSM_VIDC_EXTRADATA_FRAME_BITS_INFO = 0x00000010,

	MSM_VIDC_EXTRADATA_VQZIP_SEI = 0x00000011,

	MSM_VIDC_EXTRADATA_ROI_QP = 0x00000013,

#define MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO \

	MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO

	MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO = 0x00000014,

#define MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI \

	MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI

	MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI = 0x00000015,
@@ -252,9 +255,6 @@ enum msm_vidc_extradata_type { 
	MSM_VIDC_EXTRADATA_OUTPUT_CROP

	MSM_VIDC_EXTRADATA_OUTPUT_CROP = 0x0700000F,

	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_MULTISLICE_INFO = 0x7F100000,

	MSM_VIDC_EXTRADATA_NUM_CONCEALED_MB = 0x7F100001,

	MSM_VIDC_EXTRADATA_INDEX = 0x7F100002,