From 495f45b245d3982326718d61b9cd6441a634eed3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 3 Apr 2008 10:22:33 +0000 Subject: [PATCH] ext/theora/theoradec.c: Don't try to do anything fancy with the return code from pushing an event, it does not have e... Original commit message from CVS: * ext/theora/theoradec.c: (theora_handle_type_packet), (theora_dec_chain): Don't try to do anything fancy with the return code from pushing an event, it does not have enough information to turn it into a GST_FLOW_ERROR. --- ChangeLog | 8 ++++++++ ext/theora/theoradec.c | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1e1bbc..3402fd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-04-03 Wim Taymans + * ext/theora/theoradec.c: (theora_handle_type_packet), + (theora_dec_chain): + Don't try to do anything fancy with the return code from pushing an + event, it does not have enough information to turn it into a + GST_FLOW_ERROR. + +2008-04-03 Wim Taymans + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_reset), (gst_ogg_demux_chain_elem_pad): Add small debug line. diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c index da9680d..5581fc7 100644 --- a/ext/theora/theoradec.c +++ b/ext/theora/theoradec.c @@ -866,8 +866,6 @@ theora_handle_type_packet (GstTheoraDec * dec, ogg_packet * packet) dec->segment.format, dec->segment.start, dec->segment.stop, dec->segment.time); eret = gst_pad_push_event (dec->srcpad, event); - if (!eret) - ret = GST_FLOW_ERROR; dec->sent_newsegment = TRUE; } @@ -1451,7 +1449,7 @@ theora_dec_chain (GstPad * pad, GstBuffer * buf) dec = GST_THEORA_DEC (gst_pad_get_parent (pad)); /* peel of DISCONT flag */ - discont = GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT); + discont = GST_BUFFER_IS_DISCONT (buf); /* resync on DISCONT */ if (G_UNLIKELY (discont)) { -- 2.7.4