[longomatch] Check if caps are null before using them to update the stream props
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Check if caps are null before using them to update the stream props
- Date: Tue, 8 Jun 2010 21:48:07 +0000 (UTC)
commit 9f7c1b3348b4ae8d881552db633ee4f98969e761
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Sun Jun 6 20:11:30 2010 +0200
Check if caps are null before using them to update the stream props
libcesarplayer/src/gst-camera-capturer.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/libcesarplayer/src/gst-camera-capturer.c b/libcesarplayer/src/gst-camera-capturer.c
index 50987d4..df17736 100644
--- a/libcesarplayer/src/gst-camera-capturer.c
+++ b/libcesarplayer/src/gst-camera-capturer.c
@@ -630,6 +630,10 @@ gst_camera_capturer_expose_event (GtkWidget * widget, GdkEventExpose * event)
if (xoverlay == NULL) {
gcc_update_interface_implementations (gcc);
g_object_get (gcc->priv->camerabin, "filter-caps", &caps, NULL);
+ if (caps == NULL){
+ g_mutex_unlock (gcc->priv->lock);
+ return FALSE;
+ }
gcc_parse_video_stream_info (caps, gcc);
resize_video_window (gcc);
gst_caps_unref (caps);
@@ -1366,6 +1370,8 @@ gcc_element_msg_sync (GstBus * bus, GstMessage * msg, gpointer data)
* chance to set it before the video sink will create its own window */
if (gst_structure_has_name (msg->structure, "prepare-xwindow-id")) {
g_object_get (gcc->priv->camerabin, "filter-caps", &caps, NULL);
+ if (caps == NULL)
+ return;
gcc_parse_video_stream_info (caps, gcc);
gst_caps_unref (caps);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]