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-compliance: fix incorrect std check.
Author:  Hans Verkuil <[email protected]>
Date:    Mon Aug 29 13:14:35 2011 +0200

Signed-off-by: Hans Verkuil <[email protected]>
(cherry picked from commit 41d8c7138a882eaa1e10c09f3b4965eab04b1cd3)

 utils/v4l2-compliance/v4l2-test-io-config.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

---

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

diff --git a/utils/v4l2-compliance/v4l2-test-io-config.cpp 
b/utils/v4l2-compliance/v4l2-test-io-config.cpp
index 35a17ef..d898b4f 100644
--- a/utils/v4l2-compliance/v4l2-test-io-config.cpp
+++ b/utils/v4l2-compliance/v4l2-test-io-config.cpp
@@ -49,9 +49,9 @@ static int checkStd(struct node *node, bool has_std, 
v4l2_std_id mask)
                        warn("current standard is invalid according to the 
input standard mask\n");
                if (std == 0)
                        return fail("Standard == 0?!\n");
+               if (std & V4L2_STD_ATSC)
+                       return fail("Current standard contains ATSC standards. 
This is no longer supported\n");
        }
-       if (std & V4L2_STD_ATSC)
-               return fail("Current standard contains ATSC standards. This is 
no longer supported\n");
        ret = doioctl(node, VIDIOC_S_STD, &std);
        if (ret && has_std)
                return fail("STD cap set, but could not set standard\n");

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

Reply via email to