aboutsummaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorAlessandro Decina2011-06-12 19:49:37 -0500
committerNikhil Devshatwar2013-05-15 07:30:04 -0500
commit4c5610c6ba0907d8373be3ebc64ed7150f495869 (patch)
tree9757c06741f17b649913fde2280098db7078a895 /gst
parent2c846c20dac991ffc357a5a17bce06a7e92b093d (diff)
downloadgst-plugins-bad0-10-4c5610c6ba0907d8373be3ebc64ed7150f495869.tar.gz
gst-plugins-bad0-10-4c5610c6ba0907d8373be3ebc64ed7150f495869.tar.xz
gst-plugins-bad0-10-4c5610c6ba0907d8373be3ebc64ed7150f495869.zip
camerabin2: swap image-filter and image-capture-caps
Make it so that the capsfilter controlled by image-capture-caps is linked before the image-filter element. Makes it more consistent in that image-capture-caps always filters the output of the camera and can so be used to negotiate with the camera.
Diffstat (limited to 'gst')
-rw-r--r--gst/camerabin2/gstcamerabin2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 12aa17b5d..2d2259bcf 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -1774,8 +1774,8 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
1774 } 1774 }
1775 1775
1776 gst_camera_bin_check_and_replace_filter (camera, &camera->image_filter, 1776 gst_camera_bin_check_and_replace_filter (camera, &camera->image_filter,
1777 camera->user_image_filter, camera->src, camera->imagebin_capsfilter, 1777 camera->user_image_filter, camera->imagebin_capsfilter,
1778 "imgsrc"); 1778 camera->image_encodebin, NULL);
1779 gst_camera_bin_check_and_replace_filter (camera, &camera->video_filter, 1779 gst_camera_bin_check_and_replace_filter (camera, &camera->video_filter,
1780 camera->user_video_filter, camera->src, camera->videobin_capsfilter, 1780 camera->user_video_filter, camera->src, camera->videobin_capsfilter,
1781 "vidsrc"); 1781 "vidsrc");