From 2555eeb7370927196e8f409f5311672764823971 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Sat, 4 Apr 2009 16:28:14 +0200
Subject: [PATCH] navigation/v4l: Don't use g_return_val_if_fail for
 computed/used values.

---
 gst-libs/gst/interfaces/navigation.c | 8 ++++----
 sys/v4l/v4lsrc_calls.c               | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gst-libs/gst/interfaces/navigation.c b/gst-libs/gst/interfaces/navigation.c
index 892ee75323..8aa781dc81 100644
--- 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 9ba25581c1..7a320991a0 100644
--- 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);