mm-video: venc: Correct a typo in variable name

A kernel variable was to be defined as unsigned long but
it is mistakenly defined as unsigned only, the space is
missing after long. This bug is silent because unsigned
is also a valid data type by itself.
Corresponding to kernel fix, similar correction is done
in userspace code.

Change-Id: Ie58f275149dc9c85553f75e02594113b1a03ddcf
CRs-fixed: 556771
Merge "mm-video: venc: Correct a typo in variable name"
dashplayer: Reject https dash urls

Reject https dash urls

Change-Id: Ib26edfdcd693fe7567b89adf488a48f349ca7bfe
Merge "dashplayer: Reject https dash urls"
Merge branch 'kk_2.7_rb1.13' of git://codeaurora.org/platform/hardware/qcom/media into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into kitkat