diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:07:45 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:07:45 -0200 |
| commit | 0112b169f6a802bc14c7d9c52eed37f5990dfa93 (patch) | |
| tree | 3d9a28f99541f1f5d7a1fef224daf340e8e92c45 /v4l2-apps/util | |
| parent | 6d67fdc302e1b986dcbd6729167116a4463f1f03 (diff) | |
| parent | c8f0e62f66c8fae8399d077e41c8cbab137b3d4f (diff) | |
| download | mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.gz mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 9c1035833..198118ac6 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -509,7 +509,7 @@ static void print_qctrl(int fd, struct v4l2_queryctrl *queryctrl, ctrl->value); break; case V4L2_CTRL_TYPE_INTEGER64: - printf("%31s (int64): value=%lld", queryctrl->name, ctrl->value64); + printf("%31s (int64): value=%lld", s.c_str(), ctrl->value64); break; case V4L2_CTRL_TYPE_BOOLEAN: printf("%31s (bool) : default=%d value=%d", @@ -2159,7 +2159,7 @@ int main(int argc, char **argv) if (options[OptGetSlicedVbiCap]) { struct v4l2_sliced_vbi_cap cap; - cap.type = V4L2_BUF_TYPE_VBI_CAPTURE; + cap.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE; if (doioctl(fd, VIDIOC_G_SLICED_VBI_CAP, &cap, "VIDIOC_G_SLICED_VBI_CAP") == 0) { print_sliced_vbi_cap(cap); } @@ -2168,7 +2168,7 @@ int main(int argc, char **argv) if (options[OptGetSlicedVbiOutCap]) { struct v4l2_sliced_vbi_cap cap; - cap.type = V4L2_BUF_TYPE_VBI_OUTPUT; + cap.type = V4L2_BUF_TYPE_SLICED_VBI_OUTPUT; if (doioctl(fd, VIDIOC_G_SLICED_VBI_CAP, &cap, "VIDIOC_G_SLICED_VBI_CAP") == 0) { print_sliced_vbi_cap(cap); } |