mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-09-26 19:25:22 +02:00
commit 52cb649834
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/gstregistry.c
View file

@ -1219,11 +1219,11 @@ gst_registry_scan_path_level (GstRegistryScanContext * context,
} else { } else {
GST_INFO_OBJECT (context->registry, "cached info for %s is stale", GST_INFO_OBJECT (context->registry, "cached info for %s is stale",
filename); filename);
GST_DEBUG_OBJECT (context->registry, "mtime %ld != %ld or size %" GST_DEBUG_OBJECT (context->registry, "mtime %" G_GINT64_FORMAT " != %"
G_GINT64_FORMAT " != %" G_GINT64_FORMAT " or external dependency " G_GINT64_FORMAT " or size %" G_GINT64_FORMAT " != %"
"env_vars changed: %d or external dependencies changed: %d" G_GINT64_FORMAT " or external dependency env_vars changed: %d or"
" or old path %s != new path %s", " external dependencies changed: %d or old path %s != new path %s",
plugin->file_mtime, file_status.st_mtime, (gint64) plugin->file_mtime, (gint64) file_status.st_mtime,
(gint64) plugin->file_size, (gint64) file_status.st_size, (gint64) plugin->file_size, (gint64) file_status.st_size,
env_vars_changed, deps_changed, plugin->filename, filename); env_vars_changed, deps_changed, plugin->filename, filename);
gst_registry_remove_plugin (context->registry, plugin); gst_registry_remove_plugin (context->registry, plugin);

4
gst/gststructure.c
View file

@ -176,8 +176,8 @@ gst_structure_validate_name (const gchar * name)
while (*s && (g_ascii_isalnum (*s) || strchr ("/-_.:+", *s) != NULL)) while (*s && (g_ascii_isalnum (*s) || strchr ("/-_.:+", *s) != NULL))
s++; s++;
if (G_UNLIKELY (*s != '\0')) { if (G_UNLIKELY (*s != '\0')) {
GST_WARNING ("Invalid character '%c' at offset %lu in structure name: %s", GST_WARNING ("Invalid character '%c' at offset %" G_GUINTPTR_FORMAT " in"
*s, ((gulong) s - (gulong) name), name); " structure name: %s", *s, ((guintptr) s - (guintptr) name), name);
return FALSE; return FALSE;
} }

2
tests/examples/helloworld/helloworld.c
View file

@ -74,7 +74,7 @@ main (gint argc, gchar * argv[])
/* cleanup */ /* cleanup */
gst_element_set_state (playbin, GST_STATE_NULL); gst_element_set_state (playbin, GST_STATE_NULL);
g_object_unref (playbin); g_object_unref (playbin);
g_object_unref (loop); g_main_loop_unref (loop);
return 0; return 0;
} }