diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2013-04-18 10:13:30 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2013-04-18 10:13:30 +0100 |
commit | 7954ac2ad75d59908fcc55415eaaa0db28c4509f (patch) | |
tree | b760492e055a80b6253a44e1a8bf72b0e912ccc7 /tools | |
parent | 03c3738b6722983f077c4d06711e3d156de97a6d (diff) |
tools: update for latest context API changes
Diffstat (limited to 'tools')
-rw-r--r-- | tools/gst-launch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/gst-launch.c b/tools/gst-launch.c index a4351051c..7d88dbd5f 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -818,12 +818,13 @@ event_loop (GstElement * pipeline, gboolean blocking, gboolean do_progress, context2 = gst_element_get_context (pipeline); if (context2) { - GstStructure *s1, *s2; + const GstStructure *s1; + GstStructure *s2; /* Merge structures */ context2 = gst_context_make_writable (context2); s1 = gst_context_get_structure (context1); - s2 = gst_context_get_structure (context2); + s2 = gst_context_writable_structure (context2); gst_structure_foreach (s1, merge_structures, s2); gst_element_set_context (pipeline, context2); gst_context_unref (context2); |