diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2017-05-18 13:24:19 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2017-05-29 10:55:01 +0300 |
commit | 31c7505600f0a7653de5ba36bd2740b5f16efe4d (patch) | |
tree | 3b3965608d48aaeffe7b8a0adc315e789454c2d0 | |
parent | 08d4253905552889a8e7e6cd2438d68c498545c5 (diff) | |
download | gstreamer-plugins-base-31c7505600f0a7653de5ba36bd2740b5f16efe4d.tar.gz |
discoverer: Clean up more fields to decide if parent/child streams are equivalent
https://bugzilla.gnome.org/show_bug.cgi?id=782780
-rw-r--r-- | gst-libs/gst/pbutils/gstdiscoverer.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 5d742a66c..af35fba5c 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -1055,7 +1055,6 @@ static gboolean child_is_same_stream (const GstCaps * _parent, const GstCaps * child) { GstCaps *parent; - guint i, size; gboolean res; if (_parent == child) @@ -1065,17 +1064,7 @@ child_is_same_stream (const GstCaps * _parent, const GstCaps * child) if (!child) return FALSE; - parent = gst_caps_copy (_parent); - size = gst_caps_get_size (parent); - - for (i = 0; i < size; i++) { - gst_structure_remove_field (gst_caps_get_structure (parent, i), "parsed"); - gst_structure_remove_field (gst_caps_get_structure (parent, i), "framed"); - gst_structure_remove_field (gst_caps_get_structure (parent, i), - "stream-format"); - gst_structure_remove_field (gst_caps_get_structure (parent, i), - "alignment"); - } + parent = copy_and_clean_caps (_parent); res = gst_caps_can_intersect (parent, child); gst_caps_unref (parent); return res; |