From 5bd10cf74df979e611d69db0d5563b9d0854f884 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 15 Aug 2007 16:38:46 +0100 Subject: =?UTF-8?q?Workaround=20for=20recent=20glibc=20&=20-D=5FFORTIFY=5F?= =?UTF-8?q?SOURCE=3D2=20(defines=20open()=20as=20a=20macro).=20According?= =?UTF-8?q?=20to=20bug=201773769,=20this=20breaks=20foo->open().=20The=20f?= =?UTF-8?q?ix=20(as=20used=20in=20Ville=20Skytt=C3=A4's=20patch,=20which?= =?UTF-8?q?=20doesn't=20cover=20all=20cases)=20is=20to=20replace=20this=20?= =?UTF-8?q?with=20(foo->open)().?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch was generated using sed -i -re 's/(([[:alnum:]_]+(->|\.))+open) ?\(/(\1) (/' `grep '[>.]open \?(' include -rIl` One change (in a comment) is not committed. --- src/libxinevdec/bitplane.c | 4 ++-- src/libxinevdec/foovideo.c | 2 +- src/libxinevdec/gdkpixbuf.c | 2 +- src/libxinevdec/image.c | 2 +- src/libxinevdec/rgb.c | 4 ++-- src/libxinevdec/xine_theora_decoder.c | 2 +- src/libxinevdec/yuv.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libxinevdec') diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 033ce1392..f9a3aa8e0 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1146,7 +1146,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; this->width = (bih->biWidth + 15) & ~0x0f; @@ -1198,7 +1198,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen, init_yuv_planes(&this->yuv_planes, this->width, this->height); init_yuv_planes(&this->yuv_planes_hist, this->width, this->height); - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->decoder_ok = 1; /* load the stream/meta info */ diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 01ad84921..385784d5d 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -98,7 +98,7 @@ static void foovideo_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); if(this->buf) free(this->buf); diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index df56ba033..f5c2973fd 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -74,7 +74,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { 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; } diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 045e98000..4f33e91e6 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -81,7 +81,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { 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; } diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 32d809061..aef58be97 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -121,7 +121,7 @@ static void rgb_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; this->width = (bih->biWidth + 3) & ~0x03; @@ -152,7 +152,7 @@ static void rgb_decode_data (video_decoder_t *this_gen, init_yuv_planes(&this->yuv_planes, this->width, this->height); - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->decoder_ok = 1; /* load the stream/meta info */ diff --git a/src/libxinevdec/xine_theora_decoder.c b/src/libxinevdec/xine_theora_decoder.c index 237eed0a9..ea968c415 100644 --- a/src/libxinevdec/xine_theora_decoder.c +++ b/src/libxinevdec/xine_theora_decoder.c @@ -337,7 +337,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/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index f37ff6ca3..8314765d9 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -92,7 +92,7 @@ static void yuv_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; this->width = (bih->biWidth + 3) & ~0x03; -- cgit v1.2.3