diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-16 16:36:50 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-16 16:36:50 +0100 |
| commit | 69bdc7c638fadb8cebd81431f6f5350ecb43e3db (patch) | |
| tree | 78712ab2ecb0c6664956a59216ea7cd12c90a423 /src/libxineadec/xine_lpcm_decoder.c | |
| parent | d3e91bb09c694dc8a71b77f098ab251755763410 (diff) | |
| parent | 5bd10cf74df979e611d69db0d5563b9d0854f884 (diff) | |
| download | xine-lib-69bdc7c638fadb8cebd81431f6f5350ecb43e3db.tar.gz xine-lib-69bdc7c638fadb8cebd81431f6f5350ecb43e3db.tar.bz2 | |
Merge open()/glibc (debug #define) workaround from 1.1; fix up for 1.2 changes.
This does not touch code in contrib.
Diffstat (limited to 'src/libxineadec/xine_lpcm_decoder.c')
| -rw-r--r-- | src/libxineadec/xine_lpcm_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index 88256eb74..ef50d9c51 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -136,12 +136,12 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { /* force 24-bit samples into 16 bits for now */ if (this->bits_per_sample == 24) - this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream, + this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, 16, this->rate, this->ao_cap_mode) ; else - this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream, + this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, this->bits_per_sample, this->rate, this->ao_cap_mode) ; |