Commit 9cee92e6 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla
Browse files

Merge branch 'tracking-qcomlt-venus' into integration-linux-qcomlt 

* tracking-qcomlt-venus:
  media: vidc: Qualcomm video encoder/decoder driver
  media: v4l2-controls: add h264 5.2 level and constrained high profile
parents 407852e7 8da8c46b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment