summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-01 22:47:41 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-01 22:47:41 +0000
commit56ba2a4a6d919beecb061635f564db562b091180 (patch)
tree99e09a6393effc989f17c94c93a5b63096cb03e4
parent8471836ceaba6fc808834dee17a17146ecb62bf5 (diff)
downloadgstreamer-plugins-base-56ba2a4a6d919beecb061635f564db562b091180.tar.gz
sys/v4l/v4l_calls.c: Fix logic bug.
Original commit message from CVS: * sys/v4l/v4l_calls.c: (gst_v4l_get_chan_names): Fix logic bug.
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l/v4l_calls.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b156fdcc6..2ad1a6ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2004-12-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * sys/v4l/v4l_calls.c: (gst_v4l_get_chan_names):
+ Fix logic bug.
+
+2004-12-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* ext/ogg/gstoggdemux.c: (gst_ogg_type_find):
Yay, another one.
diff --git a/sys/v4l/v4l_calls.c b/sys/v4l/v4l_calls.c
index 000cc79e3..5d2fb9aca 100644
--- a/sys/v4l/v4l_calls.c
+++ b/sys/v4l/v4l_calls.c
@@ -317,13 +317,13 @@ gst_v4l_get_chan_names (GstV4lElement * v4lelement)
for (n = 0;; n++) {
if (n >= vchan.tuners) {
- vtun.tuner = 0;
+ vtun.tuner = 0; /* default */
} else {
vtun.tuner = n;
- if (ioctl (v4lelement->video_fd, VIDIOCGTUNER, &vtun) >= 0)
+ if (ioctl (v4lelement->video_fd, VIDIOCGTUNER, &vtun) < 0)
continue; /* no more tuners */
if (strcmp (vtun.name, vchan.name) != 0) {
- continue;
+ continue; /* not this one */
}
}
v4lchannel->tuner = n;