From 58bc2cae2eef58f1b0e3d02a6a1c9d1efbf1f82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Tue, 8 Jul 2008 13:28:51 +0000
Subject: ext/: Don't use declarations after statements.

Original commit message from CVS:
Patch by:
Jonathan Rosser <jonathan dot rosser at rd dot bbc dot co dot uk>
* ext/metadata/metadataexif.c: (metadataparse_handle_unit_tags):
* ext/metadata/metadataxmp.c:
(metadataparse_xmp_iter_add_to_tag_list):
* ext/mythtv/gstmythtvsrc.c: (gst_mythtv_src_start):
* ext/timidity/gstwildmidi.c: (gst_wildmidi_loop):
Don't use declarations after statements.
---
 ext/metadata/metadataexif.c | 7 ++++---
 ext/metadata/metadataxmp.c  | 4 ++--
 ext/mythtv/gstmythtvsrc.c   | 2 +-
 ext/timidity/gstwildmidi.c  | 4 +++-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'ext')

diff --git a/ext/metadata/metadataexif.c b/ext/metadata/metadataexif.c
index 89119e70..89c4e2b0 100644
--- a/ext/metadata/metadataexif.c
+++ b/ext/metadata/metadataexif.c
@@ -757,11 +757,12 @@ metadataparse_handle_unit_tags (ExifEntry * entry, MEUserData * meudata,
 
       break;
     case EXIF_TAG_GPS_ALTITUDE_REF:
-      meudata->altitude_ref = entry->data[0];
-
+    {
       const GValue *value = gst_tag_list_get_value_index (meudata->taglist,
           GST_TAG_GPS_ALTITUDE, 0);
 
+      meudata->altitude_ref = entry->data[0];
+
       if (value) {
         gint n, d;
 
@@ -774,7 +775,7 @@ metadataparse_handle_unit_tags (ExifEntry * entry, MEUserData * meudata,
           }
         }
       }
-
+    }
       break;
     case EXIF_TAG_GPS_LATITUDE_REF:
     {
diff --git a/ext/metadata/metadataxmp.c b/ext/metadata/metadataxmp.c
index 7291c84d..2aa386eb 100644
--- a/ext/metadata/metadataxmp.c
+++ b/ext/metadata/metadataxmp.c
@@ -756,7 +756,7 @@ metadataparse_xmp_iter_add_to_tag_list (GstTagList * taglist,
     GstTagMergeMode mode, const char *path, const char *value,
     const SchemaMap * schema_map, const uint32_t opt)
 {
-
+  GType type;
   const SchemaTagMap *smaptag =
       metadataparse_xmp_get_tagsmap_from_path (schema_map, path, opt);
 
@@ -766,7 +766,7 @@ metadataparse_xmp_iter_add_to_tag_list (GstTagList * taglist,
   if (NULL == smaptag->gst_tag)
     goto done;
 
-  GType type = gst_tag_get_type (smaptag->gst_tag);
+  type = gst_tag_get_type (smaptag->gst_tag);
 
   switch (type) {
     case G_TYPE_STRING:
diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c
index 894d9b68..4d1ddb53 100644
--- a/ext/mythtv/gstmythtvsrc.c
+++ b/ext/mythtv/gstmythtvsrc.c
@@ -535,8 +535,8 @@ gst_mythtv_src_start (GstBaseSrc * bsrc)
   src->live_tv = gmyth_uri_is_livetv (gmyth_uri);
 
   if (src->live_tv) {
-    src->spawn_livetv = gmyth_livetv_new (src->backend_info);
     gchar *ch = gmyth_uri_get_channel_name (gmyth_uri);
+    src->spawn_livetv = gmyth_livetv_new (src->backend_info);
 
     if (ch != NULL)
       src->channel_name = ch;
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index b8f72aa8..fa5b89d3 100644
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -759,9 +759,11 @@ gst_wildmidi_loop (GstPad * sinkpad)
   }
 
   if (wildmidi->o_segment_changed) {
+    GstSegment *segment;
+
     GST_DEBUG_OBJECT (wildmidi, "segment changed");
 
-    GstSegment *segment = gst_wildmidi_get_segment (wildmidi, GST_FORMAT_TIME,
+    segment = gst_wildmidi_get_segment (wildmidi, GST_FORMAT_TIME,
         !wildmidi->o_new_segment);
 
     GST_LOG_OBJECT (wildmidi,
-- 
cgit v1.2.1