diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-08-13 21:09:20 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-08-13 21:09:20 +0000 |
| commit | 031df7c737eb6e100a2653cd0640c4d66fae2dfe (patch) | |
| tree | 6ef712cb88ad71ec6e6bc9561aabea5fe057ecd2 | |
| parent | c6062bcdd303ba29c1733ea1800f779c1b726c71 (diff) | |
| download | gstreamer-plugins-bad-031df7c737eb6e100a2653cd0640c4d66fae2dfe.tar.gz | |
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
| -rw-r--r-- | gst-libs/ext/mplex/fastintfns.h | 3 | ||||
| -rw-r--r-- | gst-libs/ext/mplex/multplex.cc | 6 | ||||
| -rw-r--r-- | gst-libs/ext/mplex/yuv4mpeg_ratio.cc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gst-libs/ext/mplex/fastintfns.h b/gst-libs/ext/mplex/fastintfns.h index db78af1e8..7c1ec130f 100644 --- 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 dcdc97bad..b7cd02ce6 100644 --- 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; } diff --git a/gst-libs/ext/mplex/yuv4mpeg_ratio.cc b/gst-libs/ext/mplex/yuv4mpeg_ratio.cc index a20a23738..e02be6769 100644 --- 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; |