From c35e3e7c7d1de5cbf30ce899204338e4a2173445 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <jan@centricular.com>
Date: Sat, 31 Jan 2015 05:12:10 +1100
Subject: [PATCH] audiodecoder: Remove pointless else{} around some code

---
 gst-libs/gst/audio/gstaudiodecoder.c | 63 ++++++++++++++--------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index 0b768b1be9..c97883c2a5 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -1443,40 +1443,39 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
 
   if (dec->priv->drained && !dec->priv->gather)
     return GST_FLOW_OK;
-  else {
-    /* Send any pending events before draining, as that
-     * may update the pending segment info */
-    send_pending_events (dec);
-    /* dispatch reverse pending buffers */
-    /* chain eventually calls upon drain as well, but by that time
-     * gather list should be clear, so ok ... */
-    if (dec->output_segment.rate < 0.0 && dec->priv->gather)
-      gst_audio_decoder_chain_reverse (dec, NULL);
-    /* have subclass give all it can */
-    ret = gst_audio_decoder_push_buffers (dec, TRUE);
-    if (ret != GST_FLOW_OK) {
-      GST_WARNING_OBJECT (dec, "audio decoder push buffers failed");
-      goto drain_failed;
-    }
-    /* ensure all output sent */
-    ret = gst_audio_decoder_output (dec, NULL);
-    if (ret != GST_FLOW_OK)
-      GST_WARNING_OBJECT (dec, "audio decoder output failed");
 
-  drain_failed:
-    /* everything should be away now */
-    if (dec->priv->frames.length) {
-      /* not fatal/impossible though if subclass/codec eats stuff */
-      GST_WARNING_OBJECT (dec, "still %d frames left after draining",
-          dec->priv->frames.length);
-      g_queue_foreach (&dec->priv->frames, (GFunc) gst_buffer_unref, NULL);
-      g_queue_clear (&dec->priv->frames);
-    }
-
-    /* discard (unparsed) leftover */
-    gst_adapter_clear (dec->priv->adapter);
-    return ret;
+  /* Send any pending events before draining, as that
+   * may update the pending segment info */
+  send_pending_events (dec);
+  /* dispatch reverse pending buffers */
+  /* chain eventually calls upon drain as well, but by that time
+   * gather list should be clear, so ok ... */
+  if (dec->output_segment.rate < 0.0 && dec->priv->gather)
+    gst_audio_decoder_chain_reverse (dec, NULL);
+  /* have subclass give all it can */
+  ret = gst_audio_decoder_push_buffers (dec, TRUE);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (dec, "audio decoder push buffers failed");
+    goto drain_failed;
   }
+  /* ensure all output sent */
+  ret = gst_audio_decoder_output (dec, NULL);
+  if (ret != GST_FLOW_OK)
+    GST_WARNING_OBJECT (dec, "audio decoder output failed");
+
+drain_failed:
+  /* everything should be away now */
+  if (dec->priv->frames.length) {
+    /* not fatal/impossible though if subclass/codec eats stuff */
+    GST_WARNING_OBJECT (dec, "still %d frames left after draining",
+        dec->priv->frames.length);
+    g_queue_foreach (&dec->priv->frames, (GFunc) gst_buffer_unref, NULL);
+    g_queue_clear (&dec->priv->frames);
+  }
+
+  /* discard (unparsed) leftover */
+  gst_adapter_clear (dec->priv->adapter);
+  return ret;
 }
 
 /* hard == FLUSH, otherwise discont */