summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crete <olivier.crete@collabora.com>2015-03-10 01:35:59 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2015-03-10 01:39:02 (GMT)
commit124b6ee03c7daa67757273772b6375759b8b8695 (patch)
tree18f45aaeffd2d30582eb5a191c6c388dd0f26aee
parent62ff9b8bcaaaf6deee32841ed20c8125f9946c09 (diff)
downloadgst-plugins-base-124b6ee03c7daa67757273772b6375759b8b8695.tar.gz
gst-plugins-base-124b6ee03c7daa67757273772b6375759b8b8695.tar.xz
videorate: Accept any capsfeatures
-rw-r--r--gst/videorate/gstvideorate.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c
index 9d97763..1aaf021 100644
--- a/gst/videorate/gstvideorate.c
+++ b/gst/videorate/gstvideorate.c
@@ -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;