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.
This commit is contained in:
Sebastian Dröge 2008-07-08 13:28:51 +00:00
parent 229f3b295a
commit 58bc2cae2e
6 changed files with 23 additions and 8 deletions

View file

@ -1,3 +1,15 @@
2008-07-08 Sebastian Dröge <sebastian.droege@collabora.co.uk>
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.
2008-07-07 Zaheer Abbas Merali <zaheerabbas at merali dot org> 2008-07-07 Zaheer Abbas Merali <zaheerabbas at merali dot org>
patch by: Alessandro Decina patch by: Alessandro Decina

2
common

@ -1 +1 @@
Subproject commit 593bb114c6f5c32b529aa6443be4c2d60d6484c7 Subproject commit 79ade7b9c9bf47eee491ceee4cf3ea116140ad35

View file

@ -757,11 +757,12 @@ metadataparse_handle_unit_tags (ExifEntry * entry, MEUserData * meudata,
break; break;
case EXIF_TAG_GPS_ALTITUDE_REF: case EXIF_TAG_GPS_ALTITUDE_REF:
meudata->altitude_ref = entry->data[0]; {
const GValue *value = gst_tag_list_get_value_index (meudata->taglist, const GValue *value = gst_tag_list_get_value_index (meudata->taglist,
GST_TAG_GPS_ALTITUDE, 0); GST_TAG_GPS_ALTITUDE, 0);
meudata->altitude_ref = entry->data[0];
if (value) { if (value) {
gint n, d; gint n, d;
@ -774,7 +775,7 @@ metadataparse_handle_unit_tags (ExifEntry * entry, MEUserData * meudata,
} }
} }
} }
}
break; break;
case EXIF_TAG_GPS_LATITUDE_REF: case EXIF_TAG_GPS_LATITUDE_REF:
{ {

View file

@ -756,7 +756,7 @@ metadataparse_xmp_iter_add_to_tag_list (GstTagList * taglist,
GstTagMergeMode mode, const char *path, const char *value, GstTagMergeMode mode, const char *path, const char *value,
const SchemaMap * schema_map, const uint32_t opt) const SchemaMap * schema_map, const uint32_t opt)
{ {
GType type;
const SchemaTagMap *smaptag = const SchemaTagMap *smaptag =
metadataparse_xmp_get_tagsmap_from_path (schema_map, path, opt); 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) if (NULL == smaptag->gst_tag)
goto done; goto done;
GType type = gst_tag_get_type (smaptag->gst_tag); type = gst_tag_get_type (smaptag->gst_tag);
switch (type) { switch (type) {
case G_TYPE_STRING: case G_TYPE_STRING:

View file

@ -535,8 +535,8 @@ gst_mythtv_src_start (GstBaseSrc * bsrc)
src->live_tv = gmyth_uri_is_livetv (gmyth_uri); src->live_tv = gmyth_uri_is_livetv (gmyth_uri);
if (src->live_tv) { if (src->live_tv) {
src->spawn_livetv = gmyth_livetv_new (src->backend_info);
gchar *ch = gmyth_uri_get_channel_name (gmyth_uri); gchar *ch = gmyth_uri_get_channel_name (gmyth_uri);
src->spawn_livetv = gmyth_livetv_new (src->backend_info);
if (ch != NULL) if (ch != NULL)
src->channel_name = ch; src->channel_name = ch;

View file

@ -759,9 +759,11 @@ gst_wildmidi_loop (GstPad * sinkpad)
} }
if (wildmidi->o_segment_changed) { if (wildmidi->o_segment_changed) {
GstSegment *segment;
GST_DEBUG_OBJECT (wildmidi, "segment changed"); 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); !wildmidi->o_new_segment);
GST_LOG_OBJECT (wildmidi, GST_LOG_OBJECT (wildmidi,