diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 08:55:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 08:55:17 -0300 |
| commit | 53cd728fba53912604889bec57b74645ac73365c (patch) | |
| tree | a67d57b36c1db079ea9e1513092d80491ab2b899 /v4l2-apps | |
| parent | 68a9ab040fc3603f2d5cf37f95bed2659afb320a (diff) | |
| parent | 12612e9c32104136dbb8857ad481986555488245 (diff) | |
| download | mediapointer-dvb-s2-53cd728fba53912604889bec57b74645ac73365c.tar.gz mediapointer-dvb-s2-53cd728fba53912604889bec57b74645ac73365c.tar.bz2 | |
videodev2: Fix merge conflict
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 3e56e63a1..920fbd1a3 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -634,13 +634,17 @@ static void find_controls(int fd) for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) { qctrl.id = id; if (ioctl(fd, VIDIOC_QUERYCTRL, &qctrl) == 0 && - !(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) + !(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) { ctrl_str2id[name2var(qctrl.name)] = qctrl.id; + ctrl_id2str[qctrl.id] = name2var(qctrl.name); + } } for (qctrl.id = V4L2_CID_PRIVATE_BASE; ioctl(fd, VIDIOC_QUERYCTRL, &qctrl) == 0; qctrl.id++) { - if (!(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) + if (!(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) { ctrl_str2id[name2var(qctrl.name)] = qctrl.id; + ctrl_id2str[qctrl.id] = name2var(qctrl.name); + } } } |