summaryrefslogtreecommitdiff
path: root/src/audio_dec/xine_musepack_decoder.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-01 18:45:02 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-01 18:45:02 +0100
commitd7c4d2bd622b1405ff520006dbeaf739e9725a89 (patch)
tree104f926890dbd24257e96741a5a065f1c64ec855 /src/audio_dec/xine_musepack_decoder.c
parenta15f6b82252b5afb81486e6f0e9e10e5e2e5ece5 (diff)
parent8ba50d7512e71ce2fa441f8e738459df21cec2ae (diff)
downloadxine-lib-d7c4d2bd622b1405ff520006dbeaf739e9725a89.tar.gz
xine-lib-d7c4d2bd622b1405ff520006dbeaf739e9725a89.tar.bz2
Merge from 1.1.
--HG-- rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c rename : src/libmusepack/xine_musepack_decoder.c => src/audio_dec/xine_musepack_decoder.c
Diffstat (limited to 'src/audio_dec/xine_musepack_decoder.c')
-rw-r--r--src/audio_dec/xine_musepack_decoder.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_dec/xine_musepack_decoder.c b/src/audio_dec/xine_musepack_decoder.c
index 93991832a..84aee9387 100644
--- a/src/audio_dec/xine_musepack_decoder.c
+++ b/src/audio_dec/xine_musepack_decoder.c
@@ -348,11 +348,11 @@ static void mpc_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->bits_per_sample,
this->sample_rate,
_x_ao_channels2mode(this->channels));
- }
- /* if the audio still isn't open, do not go any further with the decode */
- if (!this->output_open)
- return;
+ /* if the audio still isn't open, do not go any further with the decode */
+ if (!this->output_open)
+ return;
+ }
/* If we run out of space in our internal buffer we discard what's
* already been read */