diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2017-10-05 17:54:34 +0200 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2017-10-05 18:12:29 +0200 |
| commit | ae8ee0315e3d1b2d993141d87f07ae3ca21d76e3 (patch) | |
| tree | 54d290c351e3a164049c3fad3858734f4daf78ed /gst-libs/gst/audio | |
| parent | d8ef396fb023a9328c2ec2e189fd1872a19e4f9d (diff) | |
| download | gstreamer-plugins-bad-ae8ee0315e3d1b2d993141d87f07ae3ca21d76e3.tar.gz | |
audioaggregator: remove buffer!=NULL check
Acording to the logic this cannot happen (we already check this before). So
add a assert like we do above and remove the check. This make it clearer that
we check for the offset range.
Also remove a dead assignment since we reassign this a few lines below.
Diffstat (limited to 'gst-libs/gst/audio')
| -rw-r--r-- | gst-libs/gst/audio/gstaudioaggregator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c index fab852de5..3447d0895 100644 --- a/gst-libs/gst/audio/gstaudioaggregator.c +++ b/gst-libs/gst/audio/gstaudioaggregator.c @@ -1287,11 +1287,11 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout) } } + g_assert (pad->priv->buffer); if (pad->priv->output_offset >= aagg->priv->offset - && pad->priv->output_offset < - aagg->priv->offset + blocksize && pad->priv->buffer) { - gboolean drop_buf = FALSE; + && pad->priv->output_offset < aagg->priv->offset + blocksize) { + gboolean drop_buf; GST_LOG_OBJECT (aggpad, "Mixing buffer for current offset"); drop_buf = !gst_audio_aggregator_mix_buffer (aagg, pad, pad->priv->buffer, |