summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-06-08 09:14:01 -0300
committerThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-06-08 09:14:01 -0300
commit233b09f9b9e9044809dea8dbd300dc7e9bb4d881 (patch)
tree64513fd38f292440571c4ca3a3bef6ab8c5f3d4b
parent7806ba95b6fa3ad5d9a32db962ac5876964528b1 (diff)
camerabin: Do not assert on set_property to NULL for elements
Check if the value is NULL before reffing them in set_property for 'GstElement' properties
-rw-r--r--gst/camerabin/gstcamerabin.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index 7630d181f..f68253e4e 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -3306,7 +3306,8 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
if (camera->app_vf_sink)
gst_object_unref (camera->app_vf_sink);
camera->app_vf_sink = g_value_get_object (value);
- gst_object_ref (camera->app_vf_sink);
+ if (camera->app_vf_sink)
+ gst_object_ref (camera->app_vf_sink);
}
break;
case ARG_VIDEO_SRC:
@@ -3318,7 +3319,8 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
if (camera->app_vid_src)
gst_object_unref (camera->app_vid_src);
camera->app_vid_src = g_value_get_object (value);
- gst_object_ref (camera->app_vid_src);
+ if (camera->app_vid_src)
+ gst_object_ref (camera->app_vid_src);
}
break;
case ARG_AUDIO_SRC: