From a3dff6621738f971d1f9cabbdfb4ba2aa664d194 Mon Sep 17 00:00:00 2001
From: Brian Cameron <brian.cameron@sun.com>
Date: Fri, 25 Jul 2003 10:15:53 +0000
Subject: Fixes to allow plugin to build with Forte.

Original commit message from CVS:
Fixes to allow plugin to build with Forte.
---
 ext/mplex/fastintfns.h      | 3 +++
 ext/mplex/multplex.cc       | 7 ++++++-
 ext/mplex/vector.cc         | 2 +-
 ext/mplex/yuv4mpeg_ratio.cc | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ext/mplex/fastintfns.h b/ext/mplex/fastintfns.h
index db78af1e..7c1ec130 100644
--- a/ext/mplex/fastintfns.h
+++ b/ext/mplex/fastintfns.h
@@ -4,6 +4,9 @@
  *
  */
 
+#ifndef __inline__
+#define __inline__ inline
+#endif
 
 static __inline__ int intmax( register int x, register int y )
 {
diff --git a/ext/mplex/multplex.cc b/ext/mplex/multplex.cc
index dcdc97ba..1cb0d908 100644
--- a/ext/mplex/multplex.cc
+++ b/ext/mplex/multplex.cc
@@ -11,6 +11,7 @@
 #include "videostrm.hh"
 #include "outputstream.hh"
 #include <cassert>
+#include "glib.h"
 
 
 /******************************************************************* 
@@ -1085,9 +1086,11 @@ OutputStream::OutputDVDPriv2 ()
 {
   uint8_t *packet_size_field;
   uint8_t *index;
-  uint8_t sector_buf[sector_size];
+  uint8_t *sector_buf;
   unsigned int tozero;
 
+  sector_buf = g_new0(uint8_t, sector_size);
+
   assert (sector_size == 2048);
   PS_Stream::BufferSectorHeader (sector_buf, pack_header_ptr, &sys_header, index);
   PS_Stream::BufferPacketHeader (index, PRIVATE_STR_2, 2,	// MPEG 2
@@ -1109,6 +1112,8 @@ OutputStream::OutputDVDPriv2 ()
   PS_Stream::BufferPacketSize (packet_size_field, index);
 
   WriteRawSector (sector_buf, sector_size);
+
+  g_free(sector_buf);
 }
 
 
diff --git a/ext/mplex/vector.cc b/ext/mplex/vector.cc
index 343b6284..901b1a5e 100644
--- a/ext/mplex/vector.cc
+++ b/ext/mplex/vector.cc
@@ -9,7 +9,7 @@
 AUStream::AUStream ():
 cur_rd (0), cur_wr (0), totalctr (0), size (0), buf (0)
 {
-  buf = new (Aunit *)[AUStream::BUF_SIZE];
+  buf = new (Aunit **)[AUStream::BUF_SIZE];
 }
 
 
diff --git a/ext/mplex/yuv4mpeg_ratio.cc b/ext/mplex/yuv4mpeg_ratio.cc
index a20a2373..262df6f9 100644
--- a/ext/mplex/yuv4mpeg_ratio.cc
+++ b/ext/mplex/yuv4mpeg_ratio.cc
@@ -109,7 +109,7 @@ y4m_ratio_reduce (y4m_ratio_t * r)
 int
 y4m_parse_ratio (y4m_ratio_t * r, const char *s)
 {
-  char *t = strchr (s, ':');
+  char *t = (char *) strchr (s, ':');
 
   if (t == NULL)
     return Y4M_ERR_RANGE;
-- 
cgit v1.2.1