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/combined | |
| 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/combined')
| -rw-r--r-- | src/combined/flac_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/nsf_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/wavpack_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/xine_speex_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/xine_theora_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/xine_vorbis_decoder.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index babfde6ae..cc7c9570a 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.c @@ -248,7 +248,7 @@ flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { - this->output_open = this->stream->audio_out->open ( + this->output_open = (this->stream->audio_out->open) ( this->stream->audio_out, this->stream, bits_per_sample, diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c index b1d8e706c..20472cd10 100644 --- a/src/combined/nsf_decoder.c +++ b/src/combined/nsf_decoder.c @@ -129,7 +129,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { /* if the audio output is not open yet, open the audio output */ if (!this->output_open) { - this->output_open = this->stream->audio_out->open( + this->output_open = (this->stream->audio_out->open) ( this->stream->audio_out, this->stream, this->bits_per_sample, diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c index 1fceb3137..0929d1b8e 100644 --- a/src/combined/wavpack_decoder.c +++ b/src/combined/wavpack_decoder.c @@ -173,7 +173,7 @@ static void wavpack_decode_data (audio_decoder_t *const this_gen, buf_element_t if (!this->output_open) { - this->output_open = this->stream->audio_out->open ( + this->output_open = (this->stream->audio_out->open) ( this->stream->audio_out, this->stream, this->bits_per_sample, diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c index d886f9153..aca048c8f 100644 --- a/src/combined/xine_speex_decoder.c +++ b/src/combined/xine_speex_decoder.c @@ -272,7 +272,7 @@ static void speex_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { if (!this->output_open) { this->output_open = - this->stream->audio_out->open(this->stream->audio_out, + (this->stream->audio_out->open) (this->stream->audio_out, this->stream, 16, this->rate, diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c index 41e11b054..d43affead 100644 --- a/src/combined/xine_theora_decoder.c +++ b/src/combined/xine_theora_decoder.c @@ -338,7 +338,7 @@ static video_decoder_t *theora_open_plugin (video_decoder_class_t *class_gen, xi theora_comment_init (&this->t_comment); theora_info_init (&this->t_info); - stream->video_out->open (stream->video_out, stream); + (stream->video_out->open) (stream->video_out, stream); return &this->theora_decoder; diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c index 0dad6ed40..344bd8ed4 100644 --- a/src/combined/xine_vorbis_decoder.c +++ b/src/combined/xine_vorbis_decoder.c @@ -177,7 +177,7 @@ static void vorbis_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { this->convsize=MAX_NUM_SAMPLES/this->vi.channels; if (!this->output_open) { - this->output_open = this->stream->audio_out->open(this->stream->audio_out, + this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, 16, this->vi.rate, |