From 0aaf9db1df81dd7a02799c6502d72ade3080ae47 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 17 Jul 2015 17:47:37 +1000 Subject: [PATCH] glcolorconvertelement: propagate failure to convert buffer upstream Rather than just silently continuing --- ext/gl/gstglcolorconvertelement.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ext/gl/gstglcolorconvertelement.c b/ext/gl/gstglcolorconvertelement.c index 833d07e014..8ad44abe54 100644 --- a/ext/gl/gstglcolorconvertelement.c +++ b/ext/gl/gstglcolorconvertelement.c @@ -197,13 +197,17 @@ gst_gl_color_convert_element_prepare_output_buffer (GstBaseTransform * bt, return GST_FLOW_NOT_NEGOTIATED; *outbuf = gst_gl_color_convert_perform (convert->convert, inbuf); + if (!*outbuf) { + GST_ELEMENT_ERROR (bt, RESOURCE, NOT_FOUND, + ("%s", "Failed to convert video buffer"), (NULL)); + return GST_FLOW_ERROR; + } /* basetransform doesn't unref if they're the same */ if (inbuf == *outbuf) gst_buffer_unref (*outbuf); - if (*outbuf) - gst_buffer_copy_into (*outbuf, inbuf, - GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS, 0, -1); + gst_buffer_copy_into (*outbuf, inbuf, + GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS, 0, -1); return GST_FLOW_OK; }