Merge open()/glibc (debug #define) workaround from 1.1; fix up for 1.2 changes.

This does not touch code in contrib.

6 files changed, 8 insertions, 8 deletions

diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index 07ccbc5ee..5812a16ea 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/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;