summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-03-13 09:54:14 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-03-13 09:54:14 +0100
commit3fae1ff05d984b3df80217b3c11ce175daff7f83 (patch)
treef808a0f5e70dca601b27c6c6ac9bfb0c4f4c803a
parent2d9756c703e7670993ce82d414d8d22cf60ddc6e (diff)
use gst_caps_merge instead of gst_caps_union
-rw-r--r--ext/resindvd/rsndec.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/resindvd/rsndec.c b/ext/resindvd/rsndec.c
index 662e932d5..788857a3b 100644
--- a/ext/resindvd/rsndec.c
+++ b/ext/resindvd/rsndec.c
@@ -201,14 +201,11 @@ rsndec_factory_filter (GstPluginFeature * feature, RsnDecFactoryFilterCtx * ctx)
/* check if the intersection is empty */
if (!gst_caps_is_empty (intersect)) {
- GstCaps *new_dec_caps;
/* non empty intersection, we can use this element */
can_sink = TRUE;
- new_dec_caps = gst_caps_union (ctx->decoder_caps, intersect);
- gst_caps_unref (ctx->decoder_caps);
- ctx->decoder_caps = new_dec_caps;
- }
- gst_caps_unref (intersect);
+ ctx->decoder_caps = gst_caps_merge (ctx->decoder_caps, intersect);
+ } else
+ gst_caps_unref (intersect);
}
}