diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-11-15 10:08:50 -0800 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-11-15 10:37:02 -0800 |
| commit | 1dfd26aaff22fe1ffacf39751d50862786d369d5 (patch) | |
| tree | 73e5526b137e7a4f5d4610c9d607c389a47303b4 /include/videodev2_samsung.h | |
| parent | 627ab66f47c4bdcb79f13fa47f3b42d2ef1a420b (diff) | |
| parent | 77143165c6ad76614f5fa1c236174783ed765a45 (diff) | |
| download | device_samsung_crespo-1dfd26aaff22fe1ffacf39751d50862786d369d5.zip device_samsung_crespo-1dfd26aaff22fe1ffacf39751d50862786d369d5.tar.gz device_samsung_crespo-1dfd26aaff22fe1ffacf39751d50862786d369d5.tar.bz2 | |
resolved conflicts for merge of 77143165 to master
Change-Id: Ic30c853d7f9898206699c3c0e648a54362ed4824
Diffstat (limited to 'include/videodev2_samsung.h')
| -rwxr-xr-x | include/videodev2_samsung.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/videodev2_samsung.h b/include/videodev2_samsung.h index 0a7d7c3..0d4dcc9 100755 --- a/include/videodev2_samsung.h +++ b/include/videodev2_samsung.h @@ -431,7 +431,10 @@ enum v4l2_caf_start_stop { CAF_MAX, }; -#define V4L2_CID_CAMERA_AUTO_FOCUS_RESULT (V4L2_CID_PRIVATE_BASE + 103) +#define V4L2_CID_CAMERA_AUTO_FOCUS_RESULT_FIRST (V4L2_CID_PRIVATE_BASE + 103) +#define V4L2_CID_CAMERA_AUTO_FOCUS_RESULT_SECOND (V4L2_CID_PRIVATE_BASE + 120) +#define V4L2_CID_CAMERA_FINISH_AUTO_FOCUS (V4L2_CID_PRIVATE_BASE + 121) + #define V4L2_CID_CAMERA_FRAME_RATE (V4L2_CID_PRIVATE_BASE + 104) enum v4l2_frame_rate { FRAME_RATE_AUTO = 0, |