summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2006-01-27 17:00:09 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2006-01-27 17:00:09 +0000
commited0038e68593ecd002576f2f04a256772878214a (patch)
treeea38ba3047549ed3826a9fb415e4233ae90f1e96
parent2b5b4217d4005d6e3217090c8ef4f11fa411a8ae (diff)
ext/libvisual/visual.c: When pad_alloc returns a GstFlowReturn other than GST_FLOW_OK, make sure it is passed upstream.
Original commit message from CVS: * ext/libvisual/visual.c: (get_buffer): When pad_alloc returns a GstFlowReturn other than GST_FLOW_OK, make sure it is passed upstream.
-rw-r--r--ChangeLog6
-rw-r--r--ext/libvisual/visual.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 23c77966..f2f14ddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-27 Jan Schmidt <thaytan@mad.scientist.com>
+ * ext/libvisual/visual.c: (get_buffer):
+ When pad_alloc returns a GstFlowReturn other
+ than GST_FLOW_OK, make sure it is passed upstream.
+
+2006-01-27 Jan Schmidt <thaytan@mad.scientist.com>
+
* ext/alsa/gstalsasink.c: (gst_alsasink_finalise),
(gst_alsasink_class_init):
Free the device name string.
diff --git a/ext/libvisual/visual.c b/ext/libvisual/visual.c
index b691e526..3e06f10e 100644
--- a/ext/libvisual/visual.c
+++ b/ext/libvisual/visual.c
@@ -363,6 +363,9 @@ get_buffer (GstVisual * visual, GstBuffer ** outbuf)
visual->video->bpp, GST_PAD_CAPS (visual->srcpad), outbuf);
}
+ if (ret != GST_FLOW_OK)
+ return ret;
+
if (*outbuf == NULL)
return GST_FLOW_ERROR;