isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl-gst: Fix get_caps implementation when no context is set

Browse Source 
If no context is set on the CoglGstVideoSink then it would previously
call gst_caps_ref with a NULL pointer. This patch makes it just return
NULL instead. I think that is a valid thing to do because that is what
gst_base_sink_default_get_caps does. If we don't do this then it's not
possible to use CoglGstVideoSink with GstParse because that tries to
link the pipeline after parsing the string. That was previously
causing a critical error because the freshly parsed sink doesn't have
a CoglContext.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Lionel Landwerlin <llandwerlin@gmail.com>
(cherry picked from commit cf26da2964e372c9fe5bd6da060a57006a83af38)
This commit is contained in:
Neil Roberts 2014-01-21 17:33:57 +00:00
parent 23044a1047
commit b898333181
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl-gst/cogl-gst-video-sink.c
View File

@ -1126,7 +1126,11 @@ cogl_gst_video_sink_get_caps (GstBaseSink *bsink,
{ {
CoglGstVideoSink *sink; CoglGstVideoSink *sink;
sink = COGL_GST_VIDEO_SINK (bsink); sink = COGL_GST_VIDEO_SINK (bsink);
return gst_caps_ref (sink->priv->caps);
if (sink->priv->caps == NULL)
return NULL;
else
return gst_caps_ref (sink->priv->caps);
} }
static CoglBool static CoglBool