all: Don't declare variables in 'for' loops

3 files changed, 12 insertions, 7 deletions

diff --git a/gst-libs/gst/mpegts/gst-dvb-descriptor.c b/gst-libs/gst/mpegts/gst-dvb-descriptor.c
index 2376b2e53..97909f3dd 100644
--- a/gst-libs/gst/mpegts/gst-dvb-descriptor.c
+++ b/gst-libs/gst/mpegts/gst-dvb-descriptor.c
@@ -542,6 +542,7 @@ gboolean
 gst_mpegts_descriptor_parse_dvb_linkage (const GstMpegTsDescriptor * descriptor,
     GstMpegTsDVBLinkageDescriptor * res)
 {
+  guint i;
   guint8 *data, *end;
 
   g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
@@ -627,7 +628,7 @@ gst_mpegts_descriptor_parse_dvb_linkage (const GstMpegTsDescriptor * descriptor,
 
       res->linkage_data = (gpointer) ext_events;
 
-      for (guint8 i = 0; i < *data++;) {
+      for (i = 0; i < *data++;) {
         GstMpegTsDVBLinkageExtendedEvent *ext_event;
 
         if (end - data < 3)
@@ -1063,6 +1064,7 @@ gst_mpegts_descriptor_parse_dvb_ca_identifier (const GstMpegTsDescriptor *
 {
   guint8 *data;
   guint16 tmp;
+  guint i;
 
   g_return_val_if_fail (descriptor != NULL && list != NULL, FALSE);
   /* 2 bytes = one entry */
@@ -1072,7 +1074,7 @@ gst_mpegts_descriptor_parse_dvb_ca_identifier (const GstMpegTsDescriptor *
 
   *list = g_array_new (FALSE, FALSE, sizeof (guint16));
 
-  for (guint i = 0; i < descriptor->length - 1; i += 2) {
+  for (i = 0; i < descriptor->length - 1; i += 2) {
     tmp = GST_READ_UINT16_BE (data);
     g_array_append_val (*list, tmp);
     data += 2;
@@ -1151,6 +1153,7 @@ gst_mpegts_descriptor_parse_dvb_parental_rating (const GstMpegTsDescriptor
     * descriptor, GPtrArray ** rating)
 {
   guint8 *data;
+  guint i;
 
   g_return_val_if_fail (descriptor != NULL && rating != NULL, FALSE);
   __common_desc_checks (descriptor, GST_MTS_DESC_DVB_PARENTAL_RATING, 0, FALSE);
@@ -1160,7 +1163,7 @@ gst_mpegts_descriptor_parse_dvb_parental_rating (const GstMpegTsDescriptor
   *rating = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_dvb_parental_rating_item_free);
 
-  for (guint8 i = 0; i < descriptor->length - 3; i += 4) {
+  for (i = 0; i < descriptor->length - 3; i += 4) {
     GstMpegTsDVBParentalRatingItem *item =
         g_slice_new0 (GstMpegTsDVBParentalRatingItem);
     g_ptr_array_add (*rating, item);
@@ -1659,6 +1662,7 @@ gst_mpegts_descriptor_parse_dvb_frequency_list (const GstMpegTsDescriptor
 {
   guint8 *data, type, len;
   guint32 freq;
+  guint i;
 
   g_return_val_if_fail (descriptor != NULL && offset != NULL &&
       list != NULL, FALSE);
@@ -1682,7 +1686,7 @@ gst_mpegts_descriptor_parse_dvb_frequency_list (const GstMpegTsDescriptor
 
   len = descriptor->length - 1;
 
-  for (guint8 i = 0; i < len - 3; i += 4) {
+  for (i = 0; i < len - 3; i += 4) {
     switch (type) {
       case 1:
         freq = BCD_32 (data) * 10;
diff --git a/gst/geometrictransform/gstgeometrictransform.c b/gst/geometrictransform/gstgeometrictransform.c
index a2377344e..7cfaafd0e 100644
--- a/gst/geometrictransform/gstgeometrictransform.c
+++ b/gst/geometrictransform/gstgeometrictransform.c
@@ -229,7 +229,7 @@ gst_geometric_transform_transform_frame (GstVideoFilter * vfilter,
 {
   GstGeometricTransform *gt;
   GstGeometricTransformClass *klass;
-  gint x, y;
+  gint x, y, i;
   GstFlowReturn ret = GST_FLOW_OK;
   gdouble *ptr;
   guint8 *in_data;
@@ -245,7 +245,7 @@ gst_geometric_transform_transform_frame (GstVideoFilter * vfilter,
     /* in AYUV black is not just all zeros:
      * 0x10 is black for Y,
      * 0x80 is black for Cr and Cb */
-    for (int i = 0; i < out_frame->map[0].size; i += 4)
+    for (i = 0; i < out_frame->map[0].size; i += 4)
       GST_WRITE_UINT32_BE (out_data + i, 0xff108080);
   } else {
     memset (out_data, 0, out_frame->map[0].size);
diff --git a/gst/geometrictransform/gstperspective.c b/gst/geometrictransform/gstperspective.c
index 0f33eb6a6..e9ed2300c 100644
--- a/gst/geometrictransform/gstperspective.c
+++ b/gst/geometrictransform/gstperspective.c
@@ -80,10 +80,11 @@ get_array_from_matrix (GstPerspective * self)
 {
   GValue v = { 0, };
   GValueArray *va;
+  int i;
 
   va = g_value_array_new (1);
 
-  for (int i = 0; i < 9; i++) {
+  for (i = 0; i < 9; i++) {
     g_value_init (&v, G_TYPE_DOUBLE);
     g_value_set_double (&v, self->matrix[i]);
     g_value_array_append (va, &v);