diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-05-05 16:23:20 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-05-05 16:23:20 +0000 |
| commit | 5ea79c29563d2fb55d21a49f4804206a66de5fb5 (patch) | |
| tree | 7805be2060d219d85c768bfe408d2bee5fa1531d /sys/v4l2 | |
| parent | 49f86d3ee6242be6f324edc2cbf36089ff5a2640 (diff) | |
| download | gst-plugins-bad-5ea79c29563d2fb55d21a49f4804206a66de5fb5.tar.gz gst-plugins-bad-5ea79c29563d2fb55d21a49f4804206a66de5fb5.tar.bz2 gst-plugins-bad-5ea79c29563d2fb55d21a49f4804206a66de5fb5.zip | |
More gcc-4.0 fixes.
Original commit message from CVS:
* ext/nas/nassink.c: (gst_nassink_init), (gst_nassink_sync_parms),
(gst_nassink_sinkconnect), (gst_nassink_chain_handle_event),
(gst_nassink_chain):
* sys/glsink/glimagesink.c: (gst_glimagesink_buffer_alloc):
* sys/v4l/gstv4ltuner.c: (gst_v4l_tuner_signal_strength):
* sys/v4l/gstv4lxoverlay.c: (gst_v4l_xoverlay_open):
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_property):
* sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open):
* sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists):
* sys/v4lradio/gstv4lradiotuner.c:
(gst_v4lradio_tuner_signal_strength):
* sys/ximage/ximagesink.c: (gst_ximagesink_buffer_alloc):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support),
(gst_xvimagesink_sink_link), (gst_xvimagesink_buffer_alloc):
More gcc-4.0 fixes.
Diffstat (limited to 'sys/v4l2')
| -rw-r--r-- | sys/v4l2/gstv4l2element.c | 2 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2xoverlay.c | 3 | ||||
| -rw-r--r-- | sys/v4l2/v4l2_calls.c | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c index 09953c94..c29d074e 100644 --- a/sys/v4l2/gstv4l2element.c +++ b/sys/v4l2/gstv4l2element.c @@ -535,7 +535,7 @@ gst_v4l2element_get_property (GObject * object, gchar *new = NULL; if (GST_V4L2_IS_OPEN (v4l2element)) - new = v4l2element->vcap.card; + new = (gchar *) v4l2element->vcap.card; g_value_set_string (value, new); break; } diff --git a/sys/v4l2/gstv4l2xoverlay.c b/sys/v4l2/gstv4l2xoverlay.c index 2e416b3e..60c258ad 100644 --- a/sys/v4l2/gstv4l2xoverlay.c +++ b/sys/v4l2/gstv4l2xoverlay.c @@ -65,7 +65,8 @@ gst_v4l2_xoverlay_open (GstV4l2Element * v4l2element) struct stat s; GstV4l2Xv *v4l2xv; const gchar *name = g_getenv ("DISPLAY"); - int ver, rel, req, ev, err, anum, i, id = 0, first_id = 0, min; + unsigned int ver, rel, req, ev, err, anum; + int i, id = 0, first_id = 0, min; XvAdaptorInfo *ai; Display *dpy; diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index fa9f3988..b630fc04 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -106,7 +106,7 @@ gst_v4l2_fill_lists (GstV4l2Element * v4l2element) v4l2channel = g_object_new (GST_TYPE_V4L2_TUNER_CHANNEL, NULL); channel = GST_TUNER_CHANNEL (v4l2channel); - channel->label = g_strdup (input.name); + channel->label = g_strdup ((const gchar *) input.name); channel->flags = GST_TUNER_CHANNEL_INPUT; v4l2channel->index = n; if (input.type == V4L2_INPUT_TYPE_TUNER) { @@ -162,7 +162,7 @@ gst_v4l2_fill_lists (GstV4l2Element * v4l2element) v4l2channel = g_object_new (GST_TYPE_V4L2_TUNER_CHANNEL, NULL); channel = GST_TUNER_CHANNEL (v4l2channel); - channel->label = g_strdup (output.name); + channel->label = g_strdup ((const gchar *) output.name); channel->flags = GST_TUNER_CHANNEL_OUTPUT; v4l2channel->index = n; if (output.audioset) { @@ -198,7 +198,7 @@ gst_v4l2_fill_lists (GstV4l2Element * v4l2element) v4l2norm = g_object_new (GST_TYPE_V4L2_TUNER_NORM, NULL); norm = GST_TUNER_NORM (v4l2norm); - norm->label = g_strdup (standard.name); + norm->label = g_strdup ((const gchar *) standard.name); norm->fps = (gfloat) standard.frameperiod.denominator / standard.frameperiod.numerator; v4l2norm->index = standard.id; @@ -259,7 +259,7 @@ gst_v4l2_fill_lists (GstV4l2Element * v4l2element) v4l2channel = g_object_new (GST_TYPE_V4L2_COLOR_BALANCE_CHANNEL, NULL); channel = GST_COLOR_BALANCE_CHANNEL (v4l2channel); - channel->label = g_strdup (control.name); + channel->label = g_strdup ((const gchar *) control.name); v4l2channel->index = n; #if 0 |