diff options
| author | Thiago Santos <thiago.sousa.santos@collabora.com> | 2012-05-01 10:18:52 -0300 |
|---|---|---|
| committer | Thiago Santos <thiago.sousa.santos@collabora.com> | 2012-05-01 15:10:51 -0300 |
| commit | 79d3cc533f494a0682683b6f2a3c0c82dbb5afee (patch) | |
| tree | 9050ff811231ba939caccde74b507f708507c155 /gst/camerabin2 | |
| parent | 7394deef33892f56b54e0f853499787032da883f (diff) | |
| download | gstreamer-plugins-bad-79d3cc533f494a0682683b6f2a3c0c82dbb5afee.tar.gz | |
camerabin: Replacing ffmpegcolorspace with videoconvert
Diffstat (limited to 'gst/camerabin2')
| -rw-r--r-- | gst/camerabin2/gstviewfinderbin.c | 4 | ||||
| -rw-r--r-- | gst/camerabin2/gstwrappercamerabinsrc.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gst/camerabin2/gstviewfinderbin.c b/gst/camerabin2/gstviewfinderbin.c index 1f87eb993..6661388ae 100644 --- a/gst/camerabin2/gstviewfinderbin.c +++ b/gst/camerabin2/gstviewfinderbin.c @@ -199,9 +199,9 @@ gst_viewfinder_bin_create_elements (GstViewfinderBin * vfbin) gst_ghost_pad_set_target (GST_GHOST_PAD (vfbin->ghostpad), NULL); /* add the elements, user wants them */ - csp = gst_element_factory_make ("ffmpegcolorspace", "vfbin-csp"); + csp = gst_element_factory_make ("videoconvert", "vfbin-csp"); if (!csp) { - missing_element_name = "ffmpegcolorspace"; + missing_element_name = "videoconvert"; goto missing_element; } gst_bin_add (GST_BIN_CAST (vfbin), csp); diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c index 6ffe0843a..0b28109e9 100644 --- a/gst/camerabin2/gstwrappercamerabinsrc.c +++ b/gst/camerabin2/gstwrappercamerabinsrc.c @@ -480,8 +480,8 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc) gst_object_unref (pad); } - if (!gst_camerabin_create_and_add_element (cbin, "ffmpegcolorspace", - "src-colorspace")) + if (!gst_camerabin_create_and_add_element (cbin, "videoconvert", + "src-videoconvert")) goto done; if (!(self->src_filter = @@ -590,10 +590,10 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc) if (!self->video_filter) { if (self->app_vid_filter) { self->video_filter = gst_object_ref (self->app_vid_filter); - filter_csp = gst_element_factory_make ("ffmpegcolorspace", - "filter-colorspace"); + filter_csp = gst_element_factory_make ("videoconvert", + "filter-videoconvert"); gst_bin_add_many (cbin, self->video_filter, filter_csp, NULL); - src_csp = gst_bin_get_by_name (cbin, "src-colorspace"); + src_csp = gst_bin_get_by_name (cbin, "src-videoconvert"); capsfilter = gst_bin_get_by_name (cbin, "src-capsfilter"); if (gst_pad_is_linked (gst_element_get_static_pad (src_csp, "src"))) gst_element_unlink (src_csp, capsfilter); |