diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-09-17 13:46:15 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-15 16:28:41 +0200 |
| commit | f839a615a0888bd3dca7a81557688fa9c3c1ae56 (patch) | |
| tree | 0b11cd5271e71f742e53d51a64fa8f2f84291df3 /sys/androidmedia/gstamcaudiodec.c | |
| parent | bc7d2006e3e1b30499ee5f8c1dd4d950bcb4c348 (diff) | |
| download | gstreamer-plugins-bad-f839a615a0888bd3dca7a81557688fa9c3c1ae56.tar.gz | |
Fix flushing logic to unbreak handling of flushing seeks
Diffstat (limited to 'sys/androidmedia/gstamcaudiodec.c')
| -rw-r--r-- | sys/androidmedia/gstamcaudiodec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c index f51fbef5e..0b49935bc 100644 --- a/sys/androidmedia/gstamcaudiodec.c +++ b/sys/androidmedia/gstamcaudiodec.c @@ -928,10 +928,8 @@ gst_amc_audio_dec_flush (GstAudioDecoder * decoder, gboolean hard) return; } - gst_amc_audio_dec_drain (self); self->flushing = TRUE; gst_amc_codec_flush (self->codec); - self->flushing = FALSE; /* Wait until the srcpad loop is finished, * unlock GST_AUDIO_DECODER_STREAM_LOCK to prevent deadlocks @@ -940,6 +938,7 @@ gst_amc_audio_dec_flush (GstAudioDecoder * decoder, gboolean hard) GST_PAD_STREAM_LOCK (GST_AUDIO_DECODER_SRC_PAD (self)); GST_PAD_STREAM_UNLOCK (GST_AUDIO_DECODER_SRC_PAD (self)); GST_AUDIO_DECODER_STREAM_LOCK (self); + self->flushing = FALSE; /* Start the srcpad loop again */ self->last_upstream_ts = 0; |