From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Thu, 9 Dec 2010 17:13:13 +0000 (-0300)
Subject: basecamerasrc: Make construct_pipeline optional
X-Git-Tag: RELEASE-0.10.21~150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80ff9300121b94787e80f19532abe0564f947025;p=platform%2Fupstream%2Fgst-plugins-bad.git

basecamerasrc: Make construct_pipeline optional

Construct pipeline should be optional. Subclasses that don't
have internal elements don't need it.
---

diff --git a/gst/camerabin2/gstbasecamerasrc.c b/gst/camerabin2/gstbasecamerasrc.c
index 07487d8..f0d4e00 100644
--- a/gst/camerabin2/gstbasecamerasrc.c
+++ b/gst/camerabin2/gstbasecamerasrc.c
@@ -390,11 +390,11 @@ construct_pipeline (GstBaseCameraSrc * self)
 {
   GstBaseCameraSrcClass *bclass = GST_BASE_CAMERA_SRC_GET_CLASS (self);
 
-  g_return_val_if_fail (bclass->construct_pipeline, FALSE);
-
-  if (!bclass->construct_pipeline (self)) {
-    GST_ERROR_OBJECT (self, "pipeline construction failed");
-    return FALSE;
+  if (bclass->construct_pipeline) {
+    if (!bclass->construct_pipeline (self)) {
+      GST_ERROR_OBJECT (self, "pipeline construction failed");
+      return FALSE;
+    }
   }
 
   return TRUE;