diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
| commit | 68c0790817b4dedf8d4d028631e98d66171e73c0 (patch) | |
| tree | 1063f6bb873d4ab3bee85e2310e06ad9f9232261 /tools/gst-discoverer.c | |
| parent | cd8742fdcb71e9bb3f987e5f98594c20b5c08134 (diff) | |
| parent | bd900a6c856c536c783aa7a53e3c6b19f3cb8bf9 (diff) | |
| download | gstreamer-plugins-base-68c0790817b4dedf8d4d028631e98d66171e73c0.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/interfaces/propertyprobe.c
sys/xvimage/xvimagesink.c
Diffstat (limited to 'tools/gst-discoverer.c')
| -rw-r--r-- | tools/gst-discoverer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c index f17def52c..c28ee648f 100644 --- a/tools/gst-discoverer.c +++ b/tools/gst-discoverer.c @@ -413,7 +413,6 @@ process_file (GstDiscoverer * dc, const gchar * filename) GDir *dir; gchar *uri, *path; GstDiscovererInfo *info; - GstStructure *st = NULL; if (!gst_uri_is_valid (filename)) { /* Recurse into directories */ @@ -461,8 +460,6 @@ process_file (GstDiscoverer * dc, const gchar * filename) if (err) g_error_free (err); gst_discoverer_info_unref (info); - if (st) - gst_structure_free (st); } else { gst_discoverer_discover_uri_async (dc, uri); } |