mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

videorate: Accept any capsfeatures

Browse source
This commit is contained in:
Olivier Crete 2015-03-09 21:35:59 -04:00 committed by Olivier Crête
parent 62ff9b8bca
commit 124b6ee03c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/videorate/gstvideorate.c
View file

@ -108,14 +108,14 @@ static GstStaticPadTemplate gst_video_rate_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw;" "image/jpeg;" "image/png")
GST_STATIC_CAPS ("video/x-raw(ANY);" "image/jpeg(ANY);" "image/png(ANY)")
);
static GstStaticPadTemplate gst_video_rate_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw;" "image/jpeg;" "image/png")
GST_STATIC_CAPS ("video/x-raw(ANY);" "image/jpeg(ANY);" "image/png(ANY)")
);
static void gst_video_rate_swap_prev (GstVideoRate * videorate,
@ -435,10 +435,13 @@ gst_video_rate_transform_caps (GstBaseTransform * trans,
G_MAXINT, 1, NULL);
}
if (s1 != NULL)
ret = gst_caps_merge_structure (ret, s1);
ret = gst_caps_merge_structure (ret, s2);
ret = gst_caps_merge_structure_full (ret, s1,
gst_caps_features_copy (gst_caps_get_features (caps, i)));
ret = gst_caps_merge_structure_full (ret, s2,
gst_caps_features_copy (gst_caps_get_features (caps, i)));
if (s3 != NULL)
ret = gst_caps_merge_structure (ret, s3);
ret = gst_caps_merge_structure_full (ret, s3,
gst_caps_features_copy (gst_caps_get_features (caps, i)));
}
if (filter) {
GstCaps *intersection;