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: use device_caps instead of capabilities. Author: Hans Verkuil <[email protected]> Date: Mon Jul 16 15:52:04 2012 +0200 Fix some querycap tests. Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit fcf32f535cf8ebd438cfcd77df3a2871619fd495) Signed-off-by: Gregor Jasny <[email protected]> utils/v4l2-compliance/v4l2-compliance.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=06decdd24c85429539ca0c99bff150505ff18497 diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp index 4c0af17..edb6a43 100644 --- a/utils/v4l2-compliance/v4l2-compliance.cpp +++ b/utils/v4l2-compliance/v4l2-compliance.cpp @@ -276,13 +276,13 @@ static int testCap(struct node *node) fail_on_test(dcaps & V4L2_CAP_DEVICE_CAPS); fail_on_test(dcaps & ~caps); fail_on_test(!(dcaps & caps)); - fail_on_test(node->is_video && !(caps & video_caps)); - fail_on_test(node->is_radio && !(caps & radio_caps)); + fail_on_test(node->is_video && !(dcaps & video_caps)); + fail_on_test(node->is_radio && !(dcaps & radio_caps)); // V4L2_CAP_AUDIO is invalid for radio - fail_on_test(node->is_radio && (caps & V4L2_CAP_AUDIO)); - fail_on_test(node->is_vbi && !(caps & vbi_caps)); + fail_on_test(node->is_radio && (dcaps & V4L2_CAP_AUDIO)); + fail_on_test(node->is_vbi && !(dcaps & vbi_caps)); // You can't have both set due to missing buffer type in VIDIOC_G/S_FBUF - fail_on_test((caps & (V4L2_CAP_VIDEO_OVERLAY | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) == + fail_on_test((dcaps & (V4L2_CAP_VIDEO_OVERLAY | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) == (V4L2_CAP_VIDEO_OVERLAY | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)); fail_on_test(node->is_video && (dcaps & (vbi_caps | radio_caps))); fail_on_test(node->is_radio && (dcaps & (vbi_caps | video_caps))); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
