Merge "msm: vdec: Updating DCVS buf count if thumbnail mode is enabled"

author Linux Build Service Account <lnxbuild@quicinc.com>

Wed, 19 Jul 2017 16:10:37 +0000 (09:10 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 19 Jul 2017 16:10:37 +0000 (09:10 -0700)
author Linux Build Service Account <lnxbuild@quicinc.com>
Wed, 19 Jul 2017 16:10:37 +0000 (09:10 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 19 Jul 2017 16:10:37 +0000 (09:10 -0700)
diff --cc drivers/media/platform/msm/vidc/msm_vdec.c
Simple merge
author	Linux Build Service Account <lnxbuild@quicinc.com>
	Wed, 19 Jul 2017 16:10:37 +0000 (09:10 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 19 Jul 2017 16:10:37 +0000 (09:10 -0700)