dont use strict fix omx_vdec_test error

Change-Id: I1e25d9150c0537983deb6028b9a420e1bf702297
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Revert "mm-video: use only IOMMU heap for non-secure playback"

This reverts commit a370c157f9ab6a5d4576820acd09dd4239879ffa.
mm-core: remove duplicate color format enum

 - duplicate definition of OMX_QCOM_COLOR_FormatYVU420SemiPlanar
   exists in OMX_IVCommon.h

Change-Id: I42afb2768c1b600ba6e2ba17267254f5d8c4b7de
mm-core: Add QC specific MetaData and MediaDefs

- to integrate extened extractor with existing framework
  new QC specific MetaData and MediaDefs are required.
- create new files to avoid changing stock MetaData and
  MediaDefs file

Change-Id: If32e182337fa4be8b039367729ffa6cecefd8115
DivxDrmDecrypt: Export the header\include file

- Export DivXDrmDecrypt.h which is needed by mm-parser
  for generating libDivxDrm
- libDixDrm is needed to play encrypted divx DRM
  content

Change-Id: I99b04f1a53c82166ca8d33b33528f1df23949d44
(cherry picked from commit 0c7cee4259b58ea43cb38b3e1d11fb8279b46c36)
mm-core: Adds support for encryption type request.

Adds support for encryption type request.

CRs-Fixed: 396778
Change-Id: I980754aa33af705e79d2051fd6fea988318c8505
(cherry picked from commit 0f0ec3a40d765901044327d21e7ee6d243e37e41)
media: Compensate for alternate display variant

 * Set correct path if CAF display driver is in use

Change-Id: I15e172029ab9bc8df0258a4e22e365a16c8fc263
Merge remote-tracking branch 'cm/cm-10.1' into jb2

Conflicts:
	mm-core/inc/QCMetaData.h
	mm-video/vidc/vdec/Android.mk
	mm-video/vidc/vdec/src/omx_vdec.cpp
mm-video: Support for QCOM_BSP define

 * Add support for QCOM_BSP flag, which implies that we have the new ION
   API and a recent KGSL.

Change-Id: Ic3041cbb2333cd69d3417141ecf21f9eefbc95ea
Merge remote-tracking branch 'cm/cm-10.1' into jb2
media: Better compatibility with new KGSL

 * Memset the params struct instead of initializing every value manually
   so that we don't have to deal with the flags/reserved change.

Change-Id: I0085d14e7f39304936534518a6adb9c8c9544b86
media: Better ION version compatibility

Change-Id: I2eb1887ecbe7a0000d2a16768b46004d92f18a82
Merge remote-tracking branch 'cm/cm-10.1' into jb2
QCOM Media: Fix duplicates conflict and mem heap

Change-Id: Ibb358e9c9e4a07f81d5e815f1d1cf9d0345972d4

Conflicts:
	mm-video/vidc/venc/Android.mk
QCOM Media: Especially for cordell again: Fix duplicates conflict

hehe he overwrote my fix and I did not see on
gerrit review.....sorry

cheers

Change-Id: Ia9a79dd28a303228e8005c86d30eb31382d8fcfd

Conflicts:
	mm-video/vidc/venc/Android.mk