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: v4l2-ctl: --clear-bitmap or --clear-clips didn't actually clear it
Author:  Hans Verkuil <[email protected]>
Date:    Sun Jul 27 13:44:16 2014 +0200

If --clear-bitmap or --clear-clips were combined with --set-fmt-overlay without
any other changes, then those options were ignored and VIDIOC_S_FMT was never
called. Add a check whether those options were defined to ensure S_FMT is
actually called.

Signed-off-by: Hans Verkuil <[email protected]>

 utils/v4l2-ctl/v4l2-ctl-overlay.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

---

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

diff --git a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp 
b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp
index f4f2db1..3cbbd56 100644
--- a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp
@@ -514,7 +514,8 @@ free:
 void overlay_set(int fd)
 {
        if ((options[OptSetOverlayFormat] || options[OptTryOverlayFormat]) &&
-                       (set_overlay_fmt || bitmap_rects.size() || 
clips.size())) {
+                       (set_overlay_fmt || options[OptClearClips] || 
options[OptClearBitmap] ||
+                        bitmap_rects.size() || clips.size())) {
                struct v4l2_format fmt;
 
                memset(&fmt, 0, sizeof(fmt));

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

Reply via email to