summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <mmeeks@ximian.org>2008-05-20 17:27:35 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-05-20 17:27:35 +0000
commitb9775592e388cea7fe8f100001f6e81a99fbbe01 (patch)
tree67d0f6a94d920f20ffdfc24d8bca718d2d1a1947
parent736b7ba31f1744a327a6843444337b77acb65a0a (diff)
ext/esd/esdsink.c: When we post an error, we must return -1 to let the parent know that we cannot write the segment e...
Original commit message from CVS: * ext/esd/esdsink.c: (gst_esdsink_write): When we post an error, we must return -1 to let the parent know that we cannot write the segment else it will loop and continue to call us again forever. Patch by Michael Meeks.
-rw-r--r--ChangeLog7
-rw-r--r--ext/esd/esdsink.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6501c7f7..06cdb90d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-20 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * ext/esd/esdsink.c: (gst_esdsink_write):
+ When we post an error, we must return -1 to let the parent know that we
+ cannot write the segment else it will loop and continue to call us again
+ forever. Patch by Michael Meeks.
+
2008-05-20 Stefan Kost <ensonic@users.sf.net>
* gst/videomixer/videomixer.c:
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index d46af07b..ed34d793 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -413,7 +413,7 @@ write_error:
{
GST_ELEMENT_ERROR (esdsink, RESOURCE, WRITE,
("Failed to write data to the esound daemon"), GST_ERROR_SYSTEM);
- return 0;
+ return -1;
}
}