summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaihua Hu <jared.hu@nxp.com>2017-05-02 13:24:30 +0800
committerSebastian Dröge <sebastian@centricular.com>2017-05-02 14:18:43 +0300
commitbeab3845574700784a0a2a41a626527bd241cfa1 (patch)
tree5d62dd008b302a98365a281f5acf2882b60df8ec
parent142469ab91d7bdd5ee1242a76437fd9899bfaa10 (diff)
downloadgstreamer-plugins-bad-beab3845574700784a0a2a41a626527bd241cfa1.tar.gz
glupload: passthrough composition caps features in directviv upload
https://bugzilla.gnome.org/show_bug.cgi?id=782046
-rw-r--r--gst-libs/gst/gl/gstglupload.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c
index 9b81892b0..2b51bfad8 100644
--- a/gst-libs/gst/gl/gstglupload.c
+++ b/gst-libs/gst/gl/gstglupload.c
@@ -1267,8 +1267,13 @@ _directviv_upload_transform_caps (gpointer impl, GstGLContext * context,
gst_caps_unref (ret);
ret = tmp;
} else {
- ret = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+ GstCaps *tmp;
+ tmp = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
(GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, GST_GL_DIRECTVIV_FORMAT));
+ ret =
+ _set_caps_features_with_passthrough (tmp,
+ GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, passthrough);
+ gst_caps_unref (tmp);
}
gst_caps_features_free (passthrough);