summaryrefslogtreecommitdiff
path: root/gst/isomp4/qtdemux.c
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-08-09 17:25:45 +0100
committerTim-Philipp Müller <tim@centricular.com>2015-08-10 12:32:23 +0100
commit0fbf5f3d9ef3d3bd0b312725cd290d8b5d969f2d (patch)
tree8bf9df4201cc70c5133f1c5f4b80cb53357bcf17 /gst/isomp4/qtdemux.c
parent7d7e54ce6863ff53e188d0276d2651b65082ffdb (diff)
downloadgstreamer-plugins-good-0fbf5f3d9ef3d3bd0b312725cd290d8b5d969f2d.tar.gz
qtdemux: don't use glib 2.44-only API
Diffstat (limited to 'gst/isomp4/qtdemux.c')
-rw-r--r--gst/isomp4/qtdemux.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 4a3cc7ce4..8a40ea1a2 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");
}
}