summaryrefslogtreecommitdiff
path: root/gst/camerabin2
diff options
context:
space:
mode:
authorThiago Santos <thiagoss@osg.samsung.com>2015-05-01 19:31:45 -0300
committerThiago Santos <thiagoss@osg.samsung.com>2015-05-01 19:44:40 -0300
commitfc4f95bb7c75216e28b58e735d446cd6b5cb1721 (patch)
tree6007aadd02efe05775470128dc80d04fb080e563 /gst/camerabin2
parent105a5cce923caa6e4454c2e1fc077614c598c108 (diff)
downloadgstreamer-plugins-bad-fc4f95bb7c75216e28b58e735d446cd6b5cb1721.tar.gz
wrappercamerabinsrc: fix element linking order
Video source should be linked to videocrop and not to videoconvert as it is done in the main linking path
Diffstat (limited to 'gst/camerabin2')
-rw-r--r--gst/camerabin2/gstwrappercamerabinsrc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c
index 8e661b83f..caae45fd0 100644
--- a/gst/camerabin2/gstwrappercamerabinsrc.c
+++ b/gst/camerabin2/gstwrappercamerabinsrc.c
@@ -456,7 +456,6 @@ check_and_replace_src (GstWrapperCameraBinSrc * self)
{
GstBin *cbin = GST_BIN_CAST (self);
GstBaseCameraSrc *bcamsrc = GST_BASE_CAMERA_SRC_CAST (self);
- GstElement *videoconvert;
if (self->src_vid_src && self->src_vid_src == self->app_vid_src) {
GST_DEBUG_OBJECT (self, "No need to change current videosrc");
@@ -496,13 +495,11 @@ check_and_replace_src (GstWrapperCameraBinSrc * self)
}
/* check if we already have the next element to link to */
- videoconvert = gst_bin_get_by_name (cbin, "src-videoconvert");
- if (videoconvert) {
- if (!gst_element_link_pads (self->src_vid_src, "src", videoconvert, "sink")) {
- gst_object_unref (videoconvert);
+ if (self->src_crop) {
+ if (!gst_element_link_pads (self->src_vid_src, "src", self->src_crop,
+ "sink")) {
return FALSE;
}
- gst_object_unref (videoconvert);
}
/* we listen for changes to max-zoom in the video src so that