From 390aa5ec7c4208898b61556eedf33a03739dc01d Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Mon, 28 Nov 2005 10:43:26 +0000 Subject: [PATCH] sys/xvimage/xvimagesink.c: Refuse to create an XvImage if we can't find the format. Original commit message from CVS: 2005-11-28 Julien MOUTTE * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_new): Refuse to create an XvImage if we can't find the format. --- ChangeLog | 5 +++++ sys/xvimage/xvimagesink.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ffa44f76c3..3e1f62a59b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-28 Julien MOUTTE + + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_new): + Refuse to create an XvImage if we can't find the format. + 2005-11-28 Edward Hervey * gst-libs/gst/riff/riff-media.c: diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index ebda4511b3..dde51a475e 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -456,11 +456,11 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps) GST_LOG_OBJECT (xvimagesink, "creating %dx%d", xvimage->width, xvimage->height); - /* We should probably get that from the caps as well */ xvimage->im_format = gst_xvimagesink_get_format_from_caps (xvimagesink, caps); if (!xvimage->im_format) { GST_WARNING_OBJECT (xvimagesink, "failed to get format from caps %" GST_PTR_FORMAT, caps); + goto beach_unlocked; } xvimage->xvimagesink = gst_object_ref (xvimagesink); @@ -533,6 +533,7 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps) beach: g_mutex_unlock (xvimagesink->x_lock); +beach_unlocked: if (!succeeded) { gst_xvimage_buffer_free (xvimage); xvimage = NULL;