From 0fbf5f3d9ef3d3bd0b312725cd290d8b5d969f2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 9 Aug 2015 17:25:45 +0100 Subject: [PATCH] qtdemux: don't use glib 2.44-only API --- gst/isomp4/qtdemux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 4a3cc7c..8a40ea1 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -4891,10 +4891,11 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux, index = stream->sample_index - (stream->n_samples - info->crypto_info->len); if (G_LIKELY (index >= 0 && index < info->crypto_info->len)) { - crypto_info = - g_steal_pointer (&g_ptr_array_index (info->crypto_info, index)); + /* steal structure from array */ + crypto_info = g_ptr_array_index (info->crypto_info, index); + g_ptr_array_index (info->crypto_info, index) = NULL; GST_LOG_OBJECT (qtdemux, "attaching cenc metadata [%u]", index); - if (!gst_buffer_add_protection_meta (buf, crypto_info)) + if (!crypto_info || !gst_buffer_add_protection_meta (buf, crypto_info)) GST_ERROR_OBJECT (qtdemux, "failed to attach cenc metadata to buffer"); } } -- 2.7.4