navigation/v4l: Don't use g_return_val_if_fail for computed/used values.

diff --git a/gst-libs/gst/interfaces/navigation.c b/gst-libs/gst/interfaces/navigation.c
index 892ee75323e9769937c7a3bde5d57928cbc3ef96..8aa781dc81fdbc061d51653422221cdf774b1590 100644 (file)
--- a/gst-libs/gst/interfaces/navigation.c
+++ b/gst-libs/gst/interfaces/navigation.c
@@ -520,13 +520,13 @@ gboolean
 gst_navigation_message_parse_mouse_over (GstMessage * message,
     gboolean * active)
 {
-  g_return_val_if_fail (GST_NAVIGATION_MESSAGE_HAS_TYPE (message, MOUSE_OVER),
-      FALSE);
+  if (!GST_NAVIGATION_MESSAGE_HAS_TYPE (message, MOUSE_OVER))
+    return FALSE;
 
   if (active) {
     const GstStructure *s = gst_message_get_structure (message);
-    g_return_val_if_fail (gst_structure_get_boolean (s, "active", active),
-        FALSE);
+    if (gst_structure_get_boolean (s, "active", active) == FALSE)
+      return FALSE;
   }
 
   return TRUE;

diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c
index 9ba25581c16cf607ed1eb174cf872e23430f2c16..7a320991a0006bf331167da704c017415375e064 100644 (file)
--- a/sys/v4l/v4lsrc_calls.c
+++ b/sys/v4l/v4lsrc_calls.c
@@ -707,7 +707,8 @@ gst_v4lsrc_buffer_new (GstV4lSrc * v4lsrc, gint num)
 
   GST_DEBUG_OBJECT (v4lsrc, "creating buffer for frame %d", num);
 
-  g_return_val_if_fail (gst_v4lsrc_get_fps (v4lsrc, &fps_n, &fps_d), NULL);
+  if (!(gst_v4lsrc_get_fps (v4lsrc, &fps_n, &fps_d)))
+    return NULL;
 
   buf = (GstBuffer *) gst_mini_object_new (GST_TYPE_V4LSRC_BUFFER);