From: Jan Schmidt Date: Fri, 20 Jan 2006 09:26:00 +0000 (+0000) Subject: libs/gst/base/gstcollectpads.c: Don't loop infinitely if there are no buffers to... X-Git-Tag: RELEASE-0_10_3~63 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dad4aea3a3917303e9c852ed04287d9c8997312;p=platform%2Fupstream%2Fgstreamer.git libs/gst/base/gstcollectpads.c: Don't loop infinitely if there are no buffers to present. Partially fixes #327197, bu... Original commit message from CVS: * libs/gst/base/gstcollectpads.c: (gst_collect_pads_is_collected): Don't loop infinitely if there are no buffers to present. Partially fixes #327197, but collectpads is just broken for reusing elements to do multiple encodes atm. --- diff --git a/ChangeLog b/ChangeLog index 991fdd60e6..7c83d3c051 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-20 Jan Schmidt + + * libs/gst/base/gstcollectpads.c: (gst_collect_pads_is_collected): + Don't loop infinitely if there are no buffers to present. Partially + fixes #327197, but collectpads is just broken for reusing elements + to do multiple encodes atm. + 2006-01-20 Jan Schmidt * tools/gst-inspect.c: (print_element_features): diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index 4df9bb8b4d..48816e4759 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -589,6 +589,10 @@ gst_collect_pads_is_collected (GstCollectPads * pads, GstFlowReturn * ret) GST_DEBUG_FUNCPTR_NAME (pads->func)); flow_ret = pads->func (pads, pads->user_data); res = TRUE; + + /* Don't keep looping after telling the element EOS or flushing */ + if (pads->queuedpads == 0) + break; } beach: