diff options
| author | Darren Salt <devspam@moreofthesa.me.uk> | 2012-06-09 18:30:59 +0100 |
|---|---|---|
| committer | Darren Salt <devspam@moreofthesa.me.uk> | 2012-06-09 18:30:59 +0100 |
| commit | f78bedc5da5b9bfb72383726c48e1f3287c5b956 (patch) | |
| tree | 1137cdb8e5785d3eef07e795109b20b2f6795a1d /src/audio_dec/xine_faad_decoder.c | |
| parent | 4227cf2d342d3803619f2ae4a34693140e9db796 (diff) | |
| parent | 9f1eb4a63fc25a5f46c64d2c374d005eb692e2ee (diff) | |
| download | xine-lib-f78bedc5da5b9bfb72383726c48e1f3287c5b956.tar.gz xine-lib-f78bedc5da5b9bfb72383726c48e1f3287c5b956.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libfaad/xine_faad_decoder.c => src/audio_dec/xine_faad_decoder.c
Diffstat (limited to 'src/audio_dec/xine_faad_decoder.c')
| -rw-r--r-- | src/audio_dec/xine_faad_decoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/audio_dec/xine_faad_decoder.c b/src/audio_dec/xine_faad_decoder.c index be495ee8f..f9eedb6e8 100644 --- a/src/audio_dec/xine_faad_decoder.c +++ b/src/audio_dec/xine_faad_decoder.c @@ -250,8 +250,10 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) { lprintf("NeAACDecDecode() returned rate=%"PRId32" channels=%d used=%d\n", this->rate, this->num_channels, used); - this->stream->audio_out->close (this->stream->audio_out, this->stream); - this->output_open = 0; + if (this->output_open) { + this->stream->audio_out->close (this->stream->audio_out, this->stream); + this->output_open = 0; + } faad_open_output( this ); faad_meta_info_set( this ); |