summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-05-11 07:55:59 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-05-11 07:56:50 +0200
commit066cf183369593824a59bb3bd43f78b74e6ecca7 (patch)
tree48e6b4ac30aa3aada25bf718cd519b0f11f681f8 /gst
parent91717ca5c2e0dd8429bb37046674be5df188164a (diff)
downloadgstreamer-plugins-bad-066cf183369593824a59bb3bd43f78b74e6ecca7.tar.gz
dvbsuboverlay: Do not try to add a feature to a caps features ANY
It does not makes sense and asserts. Based on 7f9aac386fd5d5921c80100889a5f212c0148a88 from gst-plugins-base.
Diffstat (limited to 'gst')
-rw-r--r--gst/dvbsuboverlay/gstdvbsuboverlay.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c
index 25d86b827..eaf1ca19c 100644
--- a/gst/dvbsuboverlay/gstdvbsuboverlay.c
+++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c
@@ -458,7 +458,9 @@ gst_dvbsub_overlay_add_feature_and_intersect (GstCaps * caps,
caps_size = gst_caps_get_size (new_caps);
for (i = 0; i < caps_size; i++) {
GstCapsFeatures *features = gst_caps_get_features (new_caps, i);
- gst_caps_features_add (features, feature);
+ if (!gst_caps_features_is_any (features)) {
+ gst_caps_features_add (features, feature);
+ }
}
gst_caps_append (new_caps, gst_caps_intersect_full (caps,