diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 09:01:56 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 09:01:56 +0100 |
| commit | f08e247051c5c6d0aaacc29f99a2b0bb9de8405e (patch) | |
| tree | bccf72b7de9d5db683864ac1948a0f50c6303c2b | |
| parent | 2fca270f1956fa3379ebca02203e3f95ae8aba42 (diff) | |
| parent | 39bad1d6ca2600eb9d2ad46e3842b8a564cf6c43 (diff) | |
| download | gstreamer-plugins-bad-f08e247051c5c6d0aaacc29f99a2b0bb9de8405e.tar.gz | |
Merge branch 'master' into 0.11
| -rw-r--r-- | gst/camerabin2/gstwrappercamerabinsrc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c index cef902d87..7b2a6d5cb 100644 --- a/gst/camerabin2/gstwrappercamerabinsrc.c +++ b/gst/camerabin2/gstwrappercamerabinsrc.c @@ -157,7 +157,13 @@ gst_wrapper_camera_bin_reset_video_src_caps (GstWrapperCameraBinSrc * self, clock = gst_element_get_clock (self->src_vid_src); base_time = gst_element_get_base_time (self->src_vid_src); - gst_element_set_state (self->src_vid_src, GST_STATE_READY); + /* Ideally, we should only need to get the source to READY here, + * but it seems v4l2src isn't happy with this. Putting to NULL makes + * it work. + * + * TODO fix this in v4l2src + */ + gst_element_set_state (self->src_vid_src, GST_STATE_NULL); set_capsfilter_caps (self, caps); self->drop_newseg = TRUE; |