This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/xawtv3.git tree:

Subject: console/v4l-info: Fix control detection
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Tue Feb 22 02:07:29 2011 -0300

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 console/v4l-info.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

---

http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=fda070af9cfd75b360db1339bde3c6d3c64ed627

diff --git a/console/v4l-info.c b/console/v4l-info.c
index 4764e1b..2d5230e 100644
--- a/console/v4l-info.c
+++ b/console/v4l-info.c
@@ -149,26 +149,16 @@ static int dump_v4l2(int fd, int tab)
        }
 
        printf("controls\n");
-       for (i = 0;; i++) {
+       for (i = 0; i < V4L2_CID_LASTP1 - V4L2_CID_USER_BASE; i++) {
                memset(&qctrl,0,sizeof(qctrl));
                qctrl.id = V4L2_CID_BASE+i;
                if (-1 == ioctl(fd,VIDIOC_QUERYCTRL,&qctrl))
-                       break;
+                       continue;
                if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
                        continue;
                printf("    VIDIOC_QUERYCTRL(BASE+%d)\n",i);
                print_struct(stdout,desc_v4l2_queryctrl,&qctrl,"",tab);
        }
-       for (; i < V4L2_CID_LASTP1 - V4L2_CID_USER_BASE; i++) {
-               memset(&qctrl,0,sizeof(qctrl));
-               qctrl.id = i + V4L2_CID_USER_BASE;
-               if (-1 == ioctl(fd,VIDIOC_QUERYCTRL,&qctrl))
-                       break;
-               if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-                       continue;
-               printf("    VIDIOC_QUERYCTRL(USER_BASE+%d)\n", i);
-               print_struct(stdout,desc_v4l2_queryctrl,&qctrl, "", tab);
-       }
 
        for (i = 0;; i++) {
                memset(&qctrl,0,sizeof(qctrl));

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to