summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/v4l2_calls.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-10-24 19:13:58 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-10-24 19:13:58 +0000
commita241ae070ae28cc59aa4762624b64a6c1fced1ec (patch)
treea13fbdba7c21601feef451838eb33e71a5422bed /sys/v4l2/v4l2_calls.c
parent9826bfa5b46a98bc4dff6fc91bc8495c1a61f099 (diff)
sys/v4l2/gstv4l2element.c: Flag typo.
Original commit message from CVS: * sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_property): Flag typo. * sys/v4l2/v4l2_calls.c: (gst_v4l2_set_defaults): No warnings.
Diffstat (limited to 'sys/v4l2/v4l2_calls.c')
-rw-r--r--sys/v4l2/v4l2_calls.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index 7b32ad7c..fa9f3988 100644
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -359,15 +359,18 @@ gst_v4l2_set_defaults (GstV4l2Element * v4l2element)
gst_tuner_channel_changed (tuner, channel);
g_object_notify (G_OBJECT (v4l2element), "channel");
}
- if (v4l2element->frequency != 0) {
- gst_tuner_set_frequency (tuner, channel, v4l2element->frequency);
- } else {
- v4l2element->frequency = gst_tuner_get_frequency (tuner, channel);
- if (v4l2element->frequency == 0) {
- /* guess */
- gst_tuner_set_frequency (tuner, channel, 1000);
+
+ if (GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
+ if (v4l2element->frequency != 0) {
+ gst_tuner_set_frequency (tuner, channel, v4l2element->frequency);
} else {
- g_object_notify (G_OBJECT (v4l2element), "frequency");
+ v4l2element->frequency = gst_tuner_get_frequency (tuner, channel);
+ if (v4l2element->frequency == 0) {
+ /* guess */
+ gst_tuner_set_frequency (tuner, channel, 1000);
+ } else {
+ g_object_notify (G_OBJECT (v4l2element), "frequency");
+ }
}
}
}