From ac5bff82c5258cddf3ad1717ab1ff936afcb9e26 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 3 Apr 2008 10:19:43 +0000 Subject: [PATCH] ext/ogg/gstoggdemux.c: Add small debug line. Original commit message from CVS: * ext/ogg/gstoggdemux.c: (gst_ogg_pad_reset), (gst_ogg_demux_chain_elem_pad): Add small debug line. Pass return code from the internal decoder instead of the too generic GST_FLOW_ERROR. --- ChangeLog | 8 ++++++++ common | 2 +- ext/ogg/gstoggdemux.c | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8497333f5e..b1e1bbccbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-03 Wim Taymans + + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_reset), + (gst_ogg_demux_chain_elem_pad): + Add small debug line. + Pass return code from the internal decoder instead of the too generic + GST_FLOW_ERROR. + 2008-04-03 Sebastian Dröge * gst-libs/gst/cdda/Makefile.am: diff --git a/common b/common index 5421815aee..fda6da5f2b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 5421815aeed8b2d73a4d4d4a4b8eb2c93f1b7d02 +Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 72a321e662..a03c5399ac 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -431,6 +431,8 @@ gst_ogg_pad_reset (GstOggPad * pad) { ogg_stream_reset (&pad->stream); + GST_DEBUG_OBJECT (pad, "doing reset"); + /* clear continued pages */ g_list_foreach (pad->continued, (GFunc) gst_ogg_page_free, NULL); g_list_free (pad->continued); @@ -834,7 +836,7 @@ no_decoder: decoder_error: { GST_WARNING_OBJECT (ogg, "internal decoder error"); - return GST_FLOW_ERROR; + return ret; } }