Merge "media: dvb: correct extradata namings" (2fcdfbab) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/dvb/video/mpq_dvb_video.c

+10 −10

Original line number	Diff line number	Diff line
		/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2010-2014, 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
		@@ -108,9 +108,9 @@ static int v4l2_sub_event[] = {
		#define V4L2_MPEG_VIDC_EXTRADATA_MULTISLICE_INFO_BIT 0x00000800
		#define V4L2_MPEG_VIDC_EXTRADATA_NUM_CONCEALED_MB_BIT 0x00001000
		#define V4L2_MPEG_VIDC_EXTRADATA_METADATA_FILLER_BIT 0x00002000
		#define V4L2_MPEG_VIDC_INDEX_EXTRADATA_INPUT_CROP_BIT 0x00004000
		#define V4L2_MPEG_VIDC_INDEX_EXTRADATA_DIGITAL_ZOOM_BIT 0x00008000
		#define V4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO_BIT 0x00010000
		#define V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP_BIT 0x00004000
		#define V4L2_MPEG_VIDC_EXTRADATA_DIGITAL_ZOOM_BIT 0x00008000
		#define V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO_BIT 0x00010000
		#define V4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP_BIT 0x00020000

		struct v4l2_extradata_type {
		@@ -179,16 +179,16 @@ V4L2_MPEG_VIDC_EXTRADATA_METADATA_FILLER,
		V4L2_MPEG_VIDC_EXTRADATA_METADATA_FILLER_BIT
		},
		{
		V4L2_MPEG_VIDC_INDEX_EXTRADATA_INPUT_CROP,
		V4L2_MPEG_VIDC_INDEX_EXTRADATA_INPUT_CROP_BIT
		V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP,
		V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP_BIT
		},
		{
		V4L2_MPEG_VIDC_INDEX_EXTRADATA_DIGITAL_ZOOM,
		V4L2_MPEG_VIDC_INDEX_EXTRADATA_DIGITAL_ZOOM_BIT
		V4L2_MPEG_VIDC_EXTRADATA_DIGITAL_ZOOM,
		V4L2_MPEG_VIDC_EXTRADATA_DIGITAL_ZOOM_BIT
		},
		{
		V4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO,
		V4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO_BIT
		V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO,
		V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO_BIT
		},
		{
		V4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP,