diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 09:20:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 09:20:20 -0300 |
| commit | a2f7e7dbf0f5aeb8842ac6c3e9acd151180d1975 (patch) | |
| tree | 741bed0ecafa35596053d8e6debbce43691a0a39 /v4l2-apps/util | |
| parent | 77b963e9fbc0911412eb7b86df83d976f81abf2d (diff) | |
| parent | 3590a589476f8094edb2a807adaa699215c2d5ee (diff) | |
| download | mediapointer-dvb-s2-a2f7e7dbf0f5aeb8842ac6c3e9acd151180d1975.tar.gz mediapointer-dvb-s2-a2f7e7dbf0f5aeb8842ac6c3e9acd151180d1975.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/mxl5007t
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 8 | ||||
| -rwxr-xr-x | v4l2-apps/util/v4l_rec.pl | 4 |
2 files changed, 8 insertions, 4 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); + } } } diff --git a/v4l2-apps/util/v4l_rec.pl b/v4l2-apps/util/v4l_rec.pl index b533af097..941c03634 100755 --- a/v4l2-apps/util/v4l_rec.pl +++ b/v4l2-apps/util/v4l_rec.pl @@ -16,7 +16,7 @@ $std=shift or $std='PAL-M'; $dev=shift or $dev="/dev/video1"; ############################################## -# Those stuff bellow are currently "hardcoded" +# Those stuff below are currently "hardcoded" my $acard=0; my $rec_ctrl="Aux,0"; @@ -25,7 +25,7 @@ my $vbitrate=1500; my $abitrate=224; ############################################## -# Those stuff bellow are NTSC / PAL-M specific +# Those stuff below are NTSC / PAL-M specific my $list="/usr/share/xawtv/ntsc-cable.list"; my $fps=30000/1001; |