From 97951155646b0447ea5885b8d04048861d8ee61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 13 Dec 2016 22:26:08 +0200
Subject: [PATCH] gst: Don't declare variables inside the for loop header

This is a C99 feature.
---
 ext/pango/gstbasetextoverlay.c      |  3 ++-
 tests/check/elements/videotestsrc.c | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ext/pango/gstbasetextoverlay.c b/ext/pango/gstbasetextoverlay.c
index 54a6d4c4c3..44f5f529e3 100644
--- a/ext/pango/gstbasetextoverlay.c
+++ b/ext/pango/gstbasetextoverlay.c
@@ -1638,8 +1638,9 @@ gst_base_text_overlay_set_composition (GstBaseTextOverlay * overlay)
       guint num_overlays =
           gst_video_overlay_composition_n_rectangles
           (overlay->upstream_composition);
+      guint i;
 
-      for (guint i = 0; i < num_overlays; i++) {
+      for (i = 0; i < num_overlays; i++) {
         GstVideoOverlayRectangle *rectangle;
         rectangle =
             gst_video_overlay_composition_get_rectangle
diff --git a/tests/check/elements/videotestsrc.c b/tests/check/elements/videotestsrc.c
index 5efb20a682..bf338d1c7d 100644
--- a/tests/check/elements/videotestsrc.c
+++ b/tests/check/elements/videotestsrc.c
@@ -524,7 +524,7 @@ GST_START_TEST (test_duration_query)
 GST_END_TEST;
 
 static gchar *
-get_buffer_checksum (GstBuffer *buf)
+get_buffer_checksum (GstBuffer * buf)
 {
   GstMapInfo map = GST_MAP_INFO_INIT;
   GChecksum *md5 = g_checksum_new (G_CHECKSUM_MD5);
@@ -543,11 +543,12 @@ get_buffer_checksum (GstBuffer *buf)
 GST_START_TEST (test_patterns_are_deterministic)
 {
   GType type;
-  GEnumClass * enum_class;
+  GEnumClass *enum_class;
   gint num_patterns;
   GstHarness *h[2];
   const gint num_instances = G_N_ELEMENTS (h);
   const gint num_frames = 2;
+  gint pattern, i, frame;
 
   /* Create an element to register types used below */
   gst_object_unref (gst_element_factory_make ("videotestsrc", NULL));
@@ -562,19 +563,19 @@ GST_START_TEST (test_patterns_are_deterministic)
 
   /* For each pattern, make sure that all instances produce identical
    * frames */
-  for (gint pattern = 0; pattern < num_patterns; pattern++) {
+  for (pattern = 0; pattern < num_patterns; pattern++) {
 
-    for (gint i = 0; i < G_N_ELEMENTS (h); i++) {
+    for (i = 0; i < G_N_ELEMENTS (h); i++) {
       h[i] = gst_harness_new ("videotestsrc");
       g_object_set (h[i]->element, "pattern", pattern, NULL);
       gst_harness_set_blocking_push_mode (h[i]);
       gst_harness_play (h[i]);
     }
 
-    for (gint frame = 0; frame < num_frames; frame++) {
+    for (frame = 0; frame < num_frames; frame++) {
       gchar *ref_checksum = NULL;
 
-      for (gint i = 0; i < num_instances; i++) {
+      for (i = 0; i < num_instances; i++) {
         GstBuffer *buffer = gst_harness_pull (h[i]);
         gchar *checksum = get_buffer_checksum (buffer);
 
@@ -588,10 +589,11 @@ GST_START_TEST (test_patterns_are_deterministic)
       }
       g_free (ref_checksum);
     }
-    for (gint i = 0; i < G_N_ELEMENTS (h); i++)
+    for (i = 0; i < G_N_ELEMENTS (h); i++)
       gst_harness_teardown (h[i]);
   }
 }
+
 GST_END_TEST;