diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-18 14:31:31 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-18 14:31:31 +0000 |
| commit | 25593cf777d64f48110ed11231c15680aaa22a4c (patch) | |
| tree | 926bc302733504aaed3e446e3124b2ba98f20634 | |
| parent | f13085a6f1247474374951f993b41aceef2ae94c (diff) | |
| download | xine-lib-25593cf777d64f48110ed11231c15680aaa22a4c.tar.gz xine-lib-25593cf777d64f48110ed11231c15680aaa22a4c.tar.bz2 | |
FLAC decoder post-merge fixups.
| -rw-r--r-- | src/combined/flac_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index 0b2250678..1572fd2be 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -260,12 +260,12 @@ flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { - const int bits = this->bits_per_sample; + const int bits = bits_per_sample; this->output_open = (this->stream->audio_out->open) ( this->stream->audio_out, this->stream, bits > 16 ? 16 : bits, - this->sample_rate, + sample_rate, mode); } this->buf_pos = 0; |