Merge "msm: vidc: change timestamp variable from 32 bit to 64 bit"

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, 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

int msm_venc_s_parm(struct msm_vidc_inst *inst, struct v4l2_streamparm *a)

{

	u32 property_id = 0, us_per_frame = 0;

	u32 property_id = 0;

	u64 us_per_frame = 0;

	void *pdata;

	int rc = 0, fps = 0;

	struct hal_frame_rate frame_rate;