Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst-libs / gst / audio / gstaudiodecoder.c

diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index 72c55c8..93e8fb0 100644 (file)
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -1031,7 +1031,7 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
 {
   GstFlowReturn ret;
 
-  if (dec->priv->drained)
+  if (dec->priv->drained && !dec->priv->gather)
     return GST_FLOW_OK;
   else {
     /* dispatch reverse pending buffers */