diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-02 08:27:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-02 08:27:00 -0800 |
| commit | f1921bde733c5613fe004cc47a53ae058deca566 (patch) | |
| tree | f1b51253cfa874794abbe4b078f6dcebef0c2ff1 /include | |
| parent | 892273039e5309270627ab60f9a56f72f1530e3b (diff) | |
| parent | 68251b1597841a08a6d47a4abb339b7c8eb84382 (diff) | |
Merge "msm: vidc: Add support for querying controls"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/msm_vidc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/msm_vidc.h b/include/media/msm_vidc.h index 003adc38eb14..8d13ca3cdd50 100644 --- a/include/media/msm_vidc.h +++ b/include/media/msm_vidc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -110,6 +110,7 @@ int msm_vidc_release_buffers(void *instance, int buffer_type); int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b); int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b); int msm_vidc_streamon(void *instance, enum v4l2_buf_type i); +int msm_vidc_query_ctrl(void *instance, struct v4l2_queryctrl *ctrl); int msm_vidc_streamoff(void *instance, enum v4l2_buf_type i); int msm_vidc_comm_cmd(void *instance, union msm_v4l2_cmd *cmd); int msm_vidc_poll(void *instance, struct file *filp, |