no error strict-aliasing
	modified:   mm-video-v4l2/vidc/venc/Android.mk
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into HEAD
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into HEAD
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into HEAD
media-caf-new: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into HEAD
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_hardware_qcom_media-caf-new into HEAD
Revert "mm-video: vidc: vdec: advertise color formats based on usage hint"

This reverts commit fe36a2428d49c283cddc9b882a2ae852807ec655.

Change-Id: I52f1b9ca632e6cf08c469c59d8cd09c7794bd8bd
mm-core: Kill logspam

Change-Id: I329ca5499a6d2bd75b8304e6c9cbcd8763a4b0d6
mm-video-v4l2: vdec: Use aligned line length for mapping to fb

Use aligned line length to map to framebuffer to avoid invalid
memory access in few test cases

Change-Id: I9086734190a27a17683d4031b5d2c42895f8c7e5
mm-video: Recognise "OMX.qcom.video.decoder.divx4" when setting role

Setting the component role for the "OMX.qcom.video.decoder.divx4"
component triggered an incorrect claiming that the component wasn't
recognised. This is a valid component.

Change-Id: Ib58ef8d74dcaaf6bde4bc4a07adca400822e0a11