am 4341b523: (-s ours) am 1fd49b53: am 24d5c600: am a78a91d6: (-s ours) am 068cec11: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4341b5237d35aaf77b5222d471beb9d81138a4fe':
am 63a6c9bc: update video encoder & decoder to latest kernel headers

* commit '63a6c9bcb0bb20a516059e74ec4113b541f5e919':
  update video encoder & decoder to latest kernel headers
am ed7cc9b1: Revert "vidc: vdec: Use genlock to lock/unlock buffers."

* commit 'ed7cc9b16a1081002362ffbf0a22d94f1444ab04':
  Revert "vidc: vdec: Use genlock to lock/unlock buffers."
am 17a028aa: mm-video: vidc: Compile out pmem related code

* commit '17a028aa01f5fb339a32c13bb65e1b129c024796':
  mm-video: vidc: Compile out pmem related code
am f67a778a: Merge "Add liblog" into jb-mr2-dev

* commit 'f67a778a7217c4b3933cf37055fad134a9a074f6':
  Add liblog
media: Initial support for msm8226 and msm8974

Initial merge from CAF drop M8626AAAAANLYA0070008

Change-Id: I79c1fc05b0f0b1b86f56cdfedcd5d4985a0d261e
Revert "media: Initial support for msm8226 and msm8974"

This reverts commit b79c7e8bccc229ae7d431392c0cd7c5fe24f1cd0

Change-Id: Ic1bd5a54aa7775ee0df9661e08d056496bd21363
am 89237c3f: mm-video: vidc: Flush m_input_free_q when input buffers are freed

* commit '89237c3f3c0f12e30fa3196fc010303df09e6773':
  mm-video: vidc: Flush m_input_free_q when input buffers are freed
am ea042d40: mm-video: Free frame_parser in component de-init

* commit 'ea042d401be95d9490b5d839f32d19a42507c3f3':
  mm-video: Free frame_parser in component de-init
am 068988d5: mm-video: vidc: Handle EOS buffer with content correctly

* commit '068988d56501640533aafd9ff14fe09d39d496d6':
  mm-video: vidc: Handle EOS buffer with content correctly
am be03db07: mm-video: Handle EOS and cleanup for opaque format.

* commit 'be03db07985878ca3da2edf5341261c6b67accd7':
  mm-video: Handle EOS and cleanup for opaque format.
am 73c229eb: mm-video: vdec: attach proper timestamps to delayed ETBs in EOS

* commit '73c229ebca57b299193c9634cd2c5f2145c1044d':
  mm-video: vdec: attach proper timestamps to delayed ETBs in EOS
Update mm-video to get legacy and v4l2 interfaces to co-exist

* Move mm-video to mm-video-legacy
* Add mm-video-v4l2 from codeaurora.org

Change-Id: Idf13fa2780fd0359ccefc8b004286c5a356d3546
am e5b03e41: libc2dcolorconvert: clear kgsl param struct before calling MAP_USER_MEM

* commit 'e5b03e41084814b12260bccb1395057d04eb4a7c':
  libc2dcolorconvert: clear kgsl param struct before calling MAP_USER_MEM
am 525cc9b8: mm-video: venc: Align chroma to 2K for non-camera YUV420SP input

* commit '525cc9b815b0cb86e4fc02be0bfa5f1e363804f6':
  mm-video: venc: Align chroma to 2K for non-camera YUV420SP input
mm-video: fail storeMetaDataInBuffers on output port

Metadata mode is not supported yet on output port.

Bug: 8985906
Change-Id: I3bc12553ae0070e30f864f5a671fb1d39138a61b
Reconcile with jb-mr2-release - do not merge

Change-Id: I26bfc2b5df2b342e34920ed09a0d46c38d275992
am a0ff7611: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'a0ff76113253cd9979853bfd11a80cdb46d7c6c0':
  mm-video: Handle EOS and cleanup for opaque format.
  mm-video: vidc: Handle EOS buffer with content correctly
Don't call property_get with too small a buffer.

Fix build.

Change-Id: Ifef8e94253d5896b1dea76499affc3c50fc97f1f
Don't call property_get with too small a buffer.

Fix build.

Change-Id: I6fcc9abb7a7c111b8367b1c898fc034d41250bb9