commit | 231e631e4a92bdcb10f69edb7b362b36d48ef925 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Mon Oct 28 21:40:29 2013 -0700 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Oct 28 21:40:28 2013 -0700 |
tree | 7f74e99b5875bc51c73397c5374a2869a6a98c3b | |
parent | b3f99ca8e9154ecd46dfe35e77b0615c1b7ed392 [diff] | |
parent | 20eca990cb3467464cc6ec44357567ed236f1d18 [diff] |
Merge "msm: vidc: Add 5.2 level support"
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index 7e4ceb3..9dd06ee 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c
@@ -284,6 +284,7 @@ "4.2", "5", "5.1", + "5.2", NULL, }; static const char * const h264_loop_filter[] = {