diff options
author | Stefan Kost <ensonic@users.sf.net> | 2009-07-07 00:23:41 +0100 |
---|---|---|
committer | Stefan Kost <ensonic@users.sf.net> | 2009-07-07 00:23:41 +0100 |
commit | cfae0c15e73f954f672dcc5cb7193b4dcdf27242 (patch) | |
tree | 4be66e320abd6d6a6d1f3488e371a2e59846e73f | |
parent | 2cb16ad7aa773c7b1415cd599524727ad874c4b8 (diff) |
collectpads: make it the best of wims and edwards patch.
Check the right flushing flag, but still add it to the pad-list.
-rw-r--r-- | libs/gst/base/gstcollectpads.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index c1a21f28bc..b9c3f92d34 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -1018,13 +1018,12 @@ gst_collect_pads_check_pads (GstCollectPads * pads) pads->numpads++; data = collected->data; - if (G_UNLIKELY (data->abidata.ABI.flushing)) - continue; - - if (data->buffer) - pads->queuedpads++; - if (data->abidata.ABI.eos) - pads->eospads++; + if (G_LIKELY (!data->abidata.ABI.flushing)) { + if (data->buffer) + pads->queuedpads++; + if (data->abidata.ABI.eos) + pads->eospads++; + } /* add to the list of pads to collect */ ref_data (data); |