Merge "msm: vidc: modify v4l2 mbaff flag to avoid conflict"

#define V4L2_QCOM_BUF_FLAG_CODECCONFIG		0x00020000

#define V4L2_QCOM_BUF_FLAG_CODECCONFIG		0x00020000

#define V4L2_QCOM_BUF_FLAG_EOSEQ		0x00040000

#define V4L2_QCOM_BUF_FLAG_EOSEQ		0x00040000

#define V4L2_QCOM_BUF_TIMESTAMP_INVALID		0x00080000

#define V4L2_QCOM_BUF_TIMESTAMP_INVALID		0x00080000

#define V4L2_MSM_BUF_FLAG_MBAFF			0x00100000

#define V4L2_MSM_BUF_FLAG_MBAFF			0x00000200

#define V4L2_QCOM_BUF_FLAG_DECODEONLY		0x00200000

#define V4L2_QCOM_BUF_FLAG_DECODEONLY		0x00200000

#define V4L2_QCOM_BUF_DATA_CORRUPT		0x00400000

#define V4L2_QCOM_BUF_DATA_CORRUPT		0x00400000

#define V4L2_QCOM_BUF_DROP_FRAME		0x00800000

#define V4L2_QCOM_BUF_DROP_FRAME		0x00800000