25721fadff
- Include XCB output plugins (in -extras at least for now). - Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2. - Clean up %configure options. - License: GPLv2+
102 lines
5.0 KiB
Diff
102 lines
5.0 KiB
Diff
--- xine-lib-1.1.7/src/libxinevdec/image.c~ 2007-04-15 20:42:16.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/libxinevdec/image.c 2007-08-14 00:40:05.000000000 +0300
|
|
@@ -81,7 +81,7 @@ static void image_decode_data (video_dec
|
|
|
|
if (!this->video_open) {
|
|
lprintf("opening video\n");
|
|
- this->stream->video_out->open(this->stream->video_out, this->stream);
|
|
+ (this->stream->video_out->open)(this->stream->video_out, this->stream);
|
|
this->video_open = 1;
|
|
}
|
|
|
|
--- xine-lib-1.1.7/src/libxinevdec/gdkpixbuf.c~ 2007-04-15 20:42:16.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/libxinevdec/gdkpixbuf.c 2007-08-14 00:45:36.000000000 +0300
|
|
@@ -74,7 +74,7 @@ static void image_decode_data (video_dec
|
|
|
|
if (!this->video_open) {
|
|
lprintf("opening video\n");
|
|
- this->stream->video_out->open(this->stream->video_out, this->stream);
|
|
+ (this->stream->video_out->open)(this->stream->video_out, this->stream);
|
|
this->video_open = 1;
|
|
}
|
|
|
|
--- xine-lib-1.1.7/src/libxineadec/xine_lpcm_decoder.c~ 2007-04-17 04:00:50.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/libxineadec/xine_lpcm_decoder.c 2007-08-14 00:50:49.000000000 +0300
|
|
@@ -134,12 +134,12 @@ static void lpcm_decode_data (audio_deco
|
|
|
|
/* 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) ;
|
|
--- xine-lib-1.1.7/src/xine-engine/audio_out.c~ 2007-06-05 00:37:38.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/xine-engine/audio_out.c 2007-08-14 00:34:30.000000000 +0300
|
|
@@ -1401,7 +1401,7 @@ static int ao_change_settings(aos_t *thi
|
|
_("stereo not supported by driver, converting to mono.\n"));
|
|
}
|
|
|
|
- output_sample_rate=this->driver->open(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode);
|
|
+ output_sample_rate=(this->driver->open)(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode);
|
|
} else
|
|
output_sample_rate = this->input.rate;
|
|
|
|
--- xine-lib-1.1.7/src/xine-engine/xine.c~ 2007-05-06 17:20:54.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/xine-engine/xine.c 2007-08-14 00:26:30.000000000 +0300
|
|
@@ -462,7 +462,7 @@ static int stream_rewire_audio(xine_post
|
|
|
|
if (stream->audio_out->status(stream->audio_out, stream, &bits, &rate, &mode)) {
|
|
/* register our stream at the new output port */
|
|
- new_port->open(new_port, stream, bits, rate, mode);
|
|
+ (new_port->open)(new_port, stream, bits, rate, mode);
|
|
stream->audio_out->close(stream->audio_out, stream);
|
|
}
|
|
stream->audio_out = new_port;
|
|
@@ -486,7 +486,7 @@ static int stream_rewire_video(xine_post
|
|
|
|
if (stream->video_out->status(stream->video_out, stream, &width, &height, &img_duration)) {
|
|
/* register our stream at the new output port */
|
|
- new_port->open(new_port, stream);
|
|
+ (new_port->open)(new_port, stream);
|
|
stream->video_out->close(stream->video_out, stream);
|
|
}
|
|
stream->video_out = new_port;
|
|
@@ -773,7 +773,7 @@ static int open_internal (xine_stream_t
|
|
_x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN,
|
|
(stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class)));
|
|
|
|
- res = stream->input_plugin->open(stream->input_plugin);
|
|
+ res = (stream->input_plugin->open)(stream->input_plugin);
|
|
switch(res) {
|
|
case 1: /* Open successfull */
|
|
free(input_source);
|
|
--- xine-lib-1.1.7/src/libreal/xine_real_audio_decoder.c~ 2007-04-17 04:00:50.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/libreal/xine_real_audio_decoder.c 2007-08-14 01:00:32.000000000 +0300
|
|
@@ -339,7 +339,7 @@ static int init_codec (realdec_decoder_t
|
|
return 0;
|
|
}
|
|
|
|
- this->stream->audio_out->open(this->stream->audio_out,
|
|
+ (this->stream->audio_out->open)(this->stream->audio_out,
|
|
this->stream,
|
|
bits_per_sample,
|
|
samples_per_sec,
|
|
--- xine-lib-1.1.7/src/libreal/xine_real_video_decoder.c~ 2007-04-17 04:00:50.000000000 +0300
|
|
+++ xine-lib-1.1.7/src/libreal/xine_real_video_decoder.c 2007-08-14 00:54:52.000000000 +0300
|
|
@@ -268,7 +268,7 @@ static int init_codec (realdec_decoder_t
|
|
this->rvyuv_custom_message (&cmsg_data, this->context);
|
|
}
|
|
|
|
- this->stream->video_out->open(this->stream->video_out, this->stream);
|
|
+ (this->stream->video_out->open)(this->stream->video_out, this->stream);
|
|
|
|
this->frame_size = this->width * this->height;
|
|
this->frame_buffer = xine_xmalloc (this->width * this->height * 3 / 2);
|