so bug cannot be closed yet

Original commit message from CVS:
Several solaris fixes, see #118473... One issue remaining (see the bug), so bug cannot be closed yet

diff --git a/gst-libs/ext/mplex/fastintfns.h b/gst-libs/ext/mplex/fastintfns.h
index db78af1e8c6721ca2d04d9180dff3dcf16b71eaf..7c1ec130f7c63af2b19627f8b9de55b211cf7bee 100644 (file)
--- a/gst-libs/ext/mplex/fastintfns.h
+++ b/gst-libs/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/gst-libs/ext/mplex/multplex.cc b/gst-libs/ext/mplex/multplex.cc
index dcdc97badc9eb515c0e0cb74862264ef954dfffb..b7cd02ce6200a672ccccf3f20374573e16ee3496 100644 (file)
--- a/gst-libs/ext/mplex/multplex.cc
+++ b/gst-libs/ext/mplex/multplex.cc
@@ -1085,9 +1085,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 = new 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 +1111,8 @@ OutputStream::OutputDVDPriv2 ()
   PS_Stream::BufferPacketSize (packet_size_field, index);
 
   WriteRawSector (sector_buf, sector_size);
+
+  delete sector_buf;
 }
 \f
 

diff --git a/gst-libs/ext/mplex/yuv4mpeg_ratio.cc b/gst-libs/ext/mplex/yuv4mpeg_ratio.cc
index a20a2373810e3c683c0f2cd55182b55455a1cc98..e02be6769bf103533493ae2836833ffcc3f2ed0a 100644 (file)
--- a/gst-libs/ext/mplex/yuv4mpeg_ratio.cc
+++ b/gst-libs/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, ':');
+  const char *t = strchr (s, ':');
 
   if (t == NULL)
     return Y4M_ERR_RANGE;