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

Commit 7b6a6b96 authored by Haifeng Xu's avatar Haifeng Xu
Browse files

media: dvb: correct extradata namings 



The extradata namings are corrected corresponding to the same extradata
naming correction made on msm-vidc definitions.

Change-Id: Iedd5c59952fa7b636ed060cd977e8303fbf69a5f
Signed-off-by: default avatarHaifeng Xu <haifeng@codeaurora.org>
parent 6bdb5c5c

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
@@ -114,9 +114,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 {
@@ -185,16 +185,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,