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 V4L2_CAP_AUDIO check. Author: Hans Verkuil <[email protected]> Date: Tue Sep 11 12:05:25 2012 +0200 This test never worked correctly due to a wrong if condition. Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit bcf861a2b249b713bbf89814caab1aa6340c2476) Signed-off-by: Gregor Jasny <[email protected]> utils/v4l2-compliance/v4l2-compliance.cpp | 1 - utils/v4l2-compliance/v4l2-compliance.h | 1 - utils/v4l2-compliance/v4l2-test-input-output.cpp | 2 +- 3 files changed, 1 insertions(+), 3 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=b75302c8fbbdcaecb0b82a4294bf0e6842c70091 diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp index 8320b35..301837b 100644 --- a/utils/v4l2-compliance/v4l2-compliance.cpp +++ b/utils/v4l2-compliance/v4l2-compliance.cpp @@ -64,7 +64,6 @@ static int tests_total, tests_ok; int verbose; int wrapper; int kernel_version; -unsigned caps; unsigned warnings; static struct option long_options[] = { diff --git a/utils/v4l2-compliance/v4l2-compliance.h b/utils/v4l2-compliance/v4l2-compliance.h index 88ae2be..1008231 100644 --- a/utils/v4l2-compliance/v4l2-compliance.h +++ b/utils/v4l2-compliance/v4l2-compliance.h @@ -30,7 +30,6 @@ extern int verbose; extern int wrapper; extern int kernel_version; -extern unsigned caps; extern unsigned warnings; struct test_queryctrl: v4l2_queryctrl { diff --git a/utils/v4l2-compliance/v4l2-test-input-output.cpp b/utils/v4l2-compliance/v4l2-test-input-output.cpp index a2e8ddb..4f62411 100644 --- a/utils/v4l2-compliance/v4l2-test-input-output.cpp +++ b/utils/v4l2-compliance/v4l2-test-input-output.cpp @@ -851,7 +851,7 @@ int testOutputAudio(struct node *node) return fail("invalid audioset for output %d\n", o); } - if (node->audio_outputs == 0 && node->audio_inputs && (caps & V4L2_CAP_AUDIO)) + if (node->audio_outputs == 0 && node->audio_inputs == 0 && (node->caps & V4L2_CAP_AUDIO)) return fail("no audio inputs or outputs reported, but CAP_AUDIO set\n"); return node->audio_outputs ? 0 : ENOTTY; } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
