summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-02-07 01:34:05 +0000
committerDavid Schleef <ds@schleef.org>2004-02-07 01:34:05 +0000
commit8164b238124fd44e77a129e8c51228b181177fe0 (patch)
tree635e814ac46cc2e9d56d67a1817d28d6b235ca8f
parentb704b80962903aa44128b46d8231c4feb2b15f86 (diff)
downloadgst-plugins-bad-8164b238124fd44e77a129e8c51228b181177fe0.tar.gz
gst-plugins-bad-8164b238124fd44e77a129e8c51228b181177fe0.tar.bz2
gst-plugins-bad-8164b238124fd44e77a129e8c51228b181177fe0.zip
Build fixes for OS X: (see #129600)
Original commit message from CVS: Build fixes for OS X: (see #129600) * gst-libs/gst/riff/riff-read.c: (gst_riff_read_strh), (gst_riff_read_strf_vids), (gst_riff_read_strf_auds), (gst_riff_read_strf_iavs): * gst/avi/gstavidemux.c: (gst_avi_demux_stream_avih), (gst_avi_demux_stream_odml): * gst/playondemand/Makefile.am: * gst/rtp/rtp-packet.c:
-rw-r--r--ChangeLog11
-rw-r--r--gst-libs/gst/riff/riff-read.c8
-rw-r--r--gst/playondemand/Makefile.am1
3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b077804..b492169a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-06 David Schleef <ds@schleef.org>
+
+ Build fixes for OS X: (see #129600)
+ * gst-libs/gst/riff/riff-read.c: (gst_riff_read_strh),
+ (gst_riff_read_strf_vids), (gst_riff_read_strf_auds),
+ (gst_riff_read_strf_iavs):
+ * gst/avi/gstavidemux.c: (gst_avi_demux_stream_avih),
+ (gst_avi_demux_stream_odml):
+ * gst/playondemand/Makefile.am:
+ * gst/rtp/rtp-packet.c:
+
2004-02-05 David Schleef <ds@schleef.org>
* ext/dv/gstdvdec.c: (gst_dvdec_init), (gst_dvdec_loop): Revert
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index c7b6775e..6b0c05f9 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -414,7 +414,7 @@ gst_riff_read_strh (GstRiffRead *riff,
}
if (GST_BUFFER_SIZE (buf) < sizeof (gst_riff_strh)) {
g_warning ("Too small strh (%d available, %d needed)",
- GST_BUFFER_SIZE (buf), sizeof (gst_riff_strh));
+ GST_BUFFER_SIZE (buf), (int) sizeof (gst_riff_strh));
gst_buffer_unref (buf);
return FALSE;
}
@@ -484,7 +484,7 @@ gst_riff_read_strf_vids (GstRiffRead *riff,
}
if (GST_BUFFER_SIZE (buf) < sizeof (gst_riff_strf_vids)) {
g_warning ("Too small strf_vids (%d available, %d needed)",
- GST_BUFFER_SIZE (buf), sizeof (gst_riff_strf_vids));
+ GST_BUFFER_SIZE (buf), (int) sizeof (gst_riff_strf_vids));
gst_buffer_unref (buf);
return FALSE;
}
@@ -553,7 +553,7 @@ gst_riff_read_strf_auds (GstRiffRead *riff,
}
if (GST_BUFFER_SIZE (buf) < sizeof (gst_riff_strf_auds)) {
g_warning ("Too small strf_auds (%d available, %d needed)",
- GST_BUFFER_SIZE (buf), sizeof (gst_riff_strf_auds));
+ GST_BUFFER_SIZE (buf), (int) sizeof (gst_riff_strf_auds));
gst_buffer_unref (buf);
return FALSE;
}
@@ -604,7 +604,7 @@ gst_riff_read_strf_iavs (GstRiffRead *riff,
}
if (GST_BUFFER_SIZE (buf) < sizeof (gst_riff_strf_iavs)) {
g_warning ("Too small strf_iavs (%d available, %d needed)",
- GST_BUFFER_SIZE (buf), sizeof (gst_riff_strf_iavs));
+ GST_BUFFER_SIZE (buf), (int) sizeof (gst_riff_strf_iavs));
gst_buffer_unref (buf);
return FALSE;
}
diff --git a/gst/playondemand/Makefile.am b/gst/playondemand/Makefile.am
index 1cfbe766..1bfbef77 100644
--- a/gst/playondemand/Makefile.am
+++ b/gst/playondemand/Makefile.am
@@ -16,4 +16,3 @@ demo_mp3_SOURCES = demo-mp3.c gstplayondemand.h
## putting GTK_CFLAGS first fixes a weird compilation error with GTK and XML
demo_mp3_CFLAGS = $(GTK_CFLAGS) $(GST_CFLAGS)
demo_mp3_LDFLAGS = $(GST_LIBS) $(GTK_LIBS)
-demo_mp3_DEPENDENCIES = libgstplayondemand.la