summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-05-18 10:09:41 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-05-18 10:09:41 +0000
commit9ea4aec786b13cda203707f3521e6482f9d0004a (patch)
tree8db1e8fda135e76bd2b26cab5b205df2baf6379c
parent6512a163da4246606aeef7087cc73e326466ed5c (diff)
downloadgst-plugins-bad-9ea4aec786b13cda203707f3521e6482f9d0004a.tar.gz
gst-plugins-bad-9ea4aec786b13cda203707f3521e6482f9d0004a.tar.bz2
gst-plugins-bad-9ea4aec786b13cda203707f3521e6482f9d0004a.zip
ext/: Gcc4 fixes.
Original commit message from CVS: * ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_make_clut_change_event): * ext/hermes/gsthermescolorspace.c: (gst_hermes_colorspace_structure_to_hermes_format): * ext/libmms/gstmms.c: (gst_mms_get): * ext/shout/gstshout.h: * ext/xvid/gstxvidenc.c: (gst_xvidenc_change_state): Gcc4 fixes.
-rw-r--r--ChangeLog10
-rw-r--r--ext/hermes/gsthermescolorspace.c6
-rw-r--r--ext/libmms/gstmms.c3
-rw-r--r--ext/shout/gstshout.h2
-rw-r--r--ext/xvid/gstxvidenc.c2
5 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ec4fd9f..1991c8d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2005-05-18 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_make_clut_change_event):
+ * ext/hermes/gsthermescolorspace.c:
+ (gst_hermes_colorspace_structure_to_hermes_format):
+ * ext/libmms/gstmms.c: (gst_mms_get):
+ * ext/shout/gstshout.h:
+ * ext/xvid/gstxvidenc.c: (gst_xvidenc_change_state):
+ Gcc4 fixes.
+
+2005-05-18 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* gst/wavparse/gstwavparse.c: (gst_wavparse_fmt):
Fix for channels == 0 (#304588).
diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c
index ed7639ba..7eab4e49 100644
--- a/ext/hermes/gsthermescolorspace.c
+++ b/ext/hermes/gsthermescolorspace.c
@@ -329,9 +329,9 @@ static void
gst_hermes_colorspace_structure_to_hermes_format (HermesFormat * format,
GstStructure * structure)
{
- gst_structure_get_int (structure, "red_mask", &format->r);
- gst_structure_get_int (structure, "green_mask", &format->g);
- gst_structure_get_int (structure, "blue_mask", &format->b);
+ gst_structure_get_int (structure, "red_mask", (gint *) & format->r);
+ gst_structure_get_int (structure, "green_mask", (gint *) & format->g);
+ gst_structure_get_int (structure, "blue_mask", (gint *) & format->b);
format->a = 0;
gst_structure_get_int (structure, "bpp", &format->bits);
format->indexed = 0;
diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c
index 044235af..1f355257 100644
--- a/ext/libmms/gstmms.c
+++ b/ext/libmms/gstmms.c
@@ -265,7 +265,8 @@ gst_mms_get (GstPad * pad)
GST_BUFFER_SIZE (buf) = 0;
GST_DEBUG ("reading %d bytes", mmssrc->blocksize);
- result = mms_read (NULL, mmssrc->connection, data, mmssrc->blocksize);
+ result =
+ mms_read (NULL, mmssrc->connection, (char *) data, mmssrc->blocksize);
GST_BUFFER_OFFSET (buf) = mms_get_current_pos (mmssrc->connection) - result;
GST_BUFFER_SIZE (buf) = result;
diff --git a/ext/shout/gstshout.h b/ext/shout/gstshout.h
index 129fcba8..13106154 100644
--- a/ext/shout/gstshout.h
+++ b/ext/shout/gstshout.h
@@ -34,7 +34,7 @@ typedef struct _GstIcecastSend GstIcecastSend;
struct _GstIcecastSend {
GstElement element;
- GstPad *sinkpad,*srcpad;
+ GstPad *sinkpad, *srcpad;
shout_conn_t conn;
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index 7b917534..91c4743e 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -480,7 +480,7 @@ gst_xvidenc_change_state (GstElement * element)
{
GstXvidEnc *xvidenc = GST_XVIDENC (element);
- switch (GST_STATE_PENDING (element)) {
+ switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_PAUSED_TO_READY:
if (xvidenc->handle) {
xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL);