mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-04 19:01:22 +00:00
Code Issues1 Projects Releases Wiki Activity

use gst_caps_merge instead of gst_caps_union

Browse source
This commit is contained in:
Wim Taymans 2012-03-13 09:54:14 +01:00
parent 2d9756c703
commit 3fae1ff05d
1 changed files with 3 additions and 6 deletions

7
ext/resindvd/rsndec.c
View file

@ -201,13 +201,10 @@ rsndec_factory_filter (GstPluginFeature * feature, RsnDecFactoryFilterCtx * ctx)
/* check if the intersection is empty */ /* check if the intersection is empty */
if (!gst_caps_is_empty (intersect)) { if (!gst_caps_is_empty (intersect)) {
GstCaps *new_dec_caps;
/* non empty intersection, we can use this element */ /* non empty intersection, we can use this element */
can_sink = TRUE; can_sink = TRUE;
new_dec_caps = gst_caps_union (ctx->decoder_caps, intersect); ctx->decoder_caps = gst_caps_merge (ctx->decoder_caps, intersect);
gst_caps_unref (ctx->decoder_caps); } else
ctx->decoder_caps = new_dec_caps;
}
gst_caps_unref (intersect); gst_caps_unref (intersect);
} }
} }