summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-07-08 12:51:34 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-07-08 12:51:34 +0000
commit92ed8f6a742b540d9b85271003505542451142bc (patch)
tree7884a86d9692dbceb988d838b3f8f1b6fb71452d /sys
parent23078b431b8326da30fcb60101fd26618951587b (diff)
Don't use declarations after statements and variable length arrays.
Original commit message from CVS: * ext/raw1394/gstdv1394src.c: (gst_dv1394src_uri_set_uri): * ext/speex/gstspeexenc.c: (gst_speex_enc_sink_getcaps): * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_set_wp_config): * sys/v4l2/gstv4l2src.c: (gst_v4l2src_fixate): * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_probe_caps_for_format): * tests/examples/equalizer/demo.c: (message_handler): * tests/examples/spectrum/demo-audiotest.c: (message_handler): * tests/examples/spectrum/demo-osssrc.c: (message_handler): Don't use declarations after statements and variable length arrays.
Diffstat (limited to 'sys')
-rw-r--r--sys/v4l2/gstv4l2src.c3
-rw-r--r--sys/v4l2/v4l2src_calls.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 140ea5e3..a6919b97 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -424,9 +424,10 @@ gst_v4l2src_fixate (GstBaseSrc * basesrc, GstCaps * caps)
GST_DEBUG_OBJECT (basesrc, "fixating caps %" GST_PTR_FORMAT, caps);
for (i = 0; i < gst_caps_get_size (caps); ++i) {
- structure = gst_caps_get_structure (caps, i);
const GValue *v;
+ structure = gst_caps_get_structure (caps, i);
+
/* FIXME such sizes? we usually fixate to something in the 320x200
* range... */
/* We are fixating to greater possble size (limited to GST_V4L2_MAX_SIZE)
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 9ab0989d..7878f279 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -757,11 +757,9 @@ GstCaps *
gst_v4l2src_probe_caps_for_format (GstV4l2Src * v4l2src, guint32 pixelformat,
const GstStructure * template)
{
- GstCaps *ret;
+ GstCaps *ret = gst_caps_new_empty ();
GstStructure *tmp;
- ret = gst_caps_new_empty ();
-
#ifdef VIDIOC_ENUM_FRAMESIZES
gint fd = v4l2src->v4l2object->video_fd;
struct v4l2_frmsizeenum size;