summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/jpeg/gstjpegdec.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b4eafc2c..0ccf9253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-18 Edward Hervey <edward@fluendo.com>
+
+ * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_chain):
+ After a failed buffer alloc, we need to abort the jpeg decoding (it
+ started when parsing headers to figure out how many bytes we need
+ to request downstream).
+
2006-06-18 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Mark Nauwelaerts <manauw at skynet be>
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 8fadde10..aebfe443 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -1046,6 +1046,8 @@ alloc_failed:
reason = gst_flow_get_name (ret);
GST_DEBUG_OBJECT (dec, "failed to alloc buffer, reason %s", reason);
+ /* Reset for next time */
+ jpeg_abort_decompress (&dec->cinfo);
if (GST_FLOW_IS_FATAL (ret)) {
GST_ELEMENT_ERROR (dec, STREAM, DECODE,
("Buffer allocation failed, reason: %s", reason),