audiodecoder: Remove pointless else{} around some code
This commit is contained in:
parent
7c0f885ad2
commit
c35e3e7c7d
@ -1443,7 +1443,7 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
|
|||||||
|
|
||||||
if (dec->priv->drained && !dec->priv->gather)
|
if (dec->priv->drained && !dec->priv->gather)
|
||||||
return GST_FLOW_OK;
|
return GST_FLOW_OK;
|
||||||
else {
|
|
||||||
/* Send any pending events before draining, as that
|
/* Send any pending events before draining, as that
|
||||||
* may update the pending segment info */
|
* may update the pending segment info */
|
||||||
send_pending_events (dec);
|
send_pending_events (dec);
|
||||||
@ -1463,7 +1463,7 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
|
|||||||
if (ret != GST_FLOW_OK)
|
if (ret != GST_FLOW_OK)
|
||||||
GST_WARNING_OBJECT (dec, "audio decoder output failed");
|
GST_WARNING_OBJECT (dec, "audio decoder output failed");
|
||||||
|
|
||||||
drain_failed:
|
drain_failed:
|
||||||
/* everything should be away now */
|
/* everything should be away now */
|
||||||
if (dec->priv->frames.length) {
|
if (dec->priv->frames.length) {
|
||||||
/* not fatal/impossible though if subclass/codec eats stuff */
|
/* not fatal/impossible though if subclass/codec eats stuff */
|
||||||
@ -1476,7 +1476,6 @@ gst_audio_decoder_drain (GstAudioDecoder * dec)
|
|||||||
/* discard (unparsed) leftover */
|
/* discard (unparsed) leftover */
|
||||||
gst_adapter_clear (dec->priv->adapter);
|
gst_adapter_clear (dec->priv->adapter);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* hard == FLUSH, otherwise discont */
|
/* hard == FLUSH, otherwise discont */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user