diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2015-06-01 07:15:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-06-06 07:33:17 -0300 |
| commit | 63344b6592f1d69e13d0e32d8b213137ab6b663e (patch) | |
| tree | aa29b7423cf9b858acb77ca565e20ebd8e727f7b /drivers/media/platform/vivid/vivid-core.h | |
| parent | cc1821964d122c39a80e653163513f11ccc39524 (diff) | |
| download | op-kernel-dev-63344b6592f1d69e13d0e32d8b213137ab6b663e.zip op-kernel-dev-63344b6592f1d69e13d0e32d8b213137ab6b663e.tar.gz | |
[media] vivid: move video loopback control to the capture device
This has been on my TODO list for some time now: the control that enables the video
loopback was part of the controls of the video output device instead of the video
capture device. In practice this was quite annoying since you expect it at the capture
side since that's where you want to make the decision whether to use the TPG or looped
video.
This patch moves the control from the output to the capture side.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-core.h')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h index 3755b18..c72349c 100644 --- a/drivers/media/platform/vivid/vivid-core.h +++ b/drivers/media/platform/vivid/vivid-core.h @@ -139,7 +139,7 @@ struct vivid_dev { struct v4l2_ctrl_handler ctrl_hdl_user_aud; struct v4l2_ctrl_handler ctrl_hdl_streaming; struct v4l2_ctrl_handler ctrl_hdl_sdtv_cap; - struct v4l2_ctrl_handler ctrl_hdl_loop_out; + struct v4l2_ctrl_handler ctrl_hdl_loop_cap; struct video_device vid_cap_dev; struct v4l2_ctrl_handler ctrl_hdl_vid_cap; struct video_device vid_out_dev; |
