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

Subject: libv4lcontrol: fix queryctrl handling
Author:  Hans Verkuil <hverk...@xs4all.nl>
Date:    Sat May 1 13:40:59 2010 +0200

When enumerating the controls using V4L2_CTRL_FLAG_NEXT_CTRL then queryctrl
should always remove V4L2_CTRL_FLAG_NEXT_CTRL when returning, even if no
next control was found.

So instead of using V4L2_CTRL_FLAG_NEXT_CTRL as the 'maximum' control ID
libv4lcontrol.c should use V4L2_CTRL_ID_MASK instead (which is really the
highest possible ID).

This bug caused qv4l2 to show the user controls twice.

Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

 lib/libv4lconvert/control/libv4lcontrol.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=e1613786523437227b0aac5ae3ec023a2c62c805

diff --git a/lib/libv4lconvert/control/libv4lcontrol.c 
b/lib/libv4lconvert/control/libv4lcontrol.c
index 715ba69..d7b5316 100644
--- a/lib/libv4lconvert/control/libv4lcontrol.c
+++ b/lib/libv4lconvert/control/libv4lcontrol.c
@@ -823,7 +823,7 @@ int v4lcontrol_vidioc_queryctrl(struct v4lcontrol_data 
*data, void *arg)
                /* If the hardware has no more controls check if we still have 
any
                   fake controls with a higher id then the hardware's highest */
                if (retval)
-                       ctrl->id = V4L2_CTRL_FLAG_NEXT_CTRL;
+                       ctrl->id = V4L2_CTRL_ID_MASK;
 
                /* If any of our controls have an id > orig_id but less than
                   ctrl->id then return that control instead. Note we do not

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to