From 145270dd7ebc6aeb4ee246c34c1613e20366c685 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sun, 24 Oct 2004 19:13:58 +0000
Subject: 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.
---
 sys/v4l2/gstv4l2element.c |  2 +-
 sys/v4l2/v4l2_calls.c     | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'sys')

diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c
index 4b7c6182..a89e2bfb 100644
--- a/sys/v4l2/gstv4l2element.c
+++ b/sys/v4l2/gstv4l2element.c
@@ -540,7 +540,7 @@ gst_v4l2element_get_property (GObject * object,
       guint flags = 0;
 
       if (GST_V4L2_IS_OPEN (v4l2element)) {
-        flags |= v4l2element->vcap.capabilities & 30007;
+        flags |= v4l2element->vcap.capabilities & 0x30007;
       }
       g_value_set_flags (value, flags);
       break;
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");
+      }
     }
   }
 }
-- 
cgit v1.2.1