diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-16 14:33:20 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-16 14:33:20 +0100 |
| commit | 2fca270f1956fa3379ebca02203e3f95ae8aba42 (patch) | |
| tree | 8ae2bb3e039698f88e6ba73240db9f0b8268d6ba /gst/camerabin2/gstwrappercamerabinsrc.c | |
| parent | c7216162e4b8bf1b9988c8b0977a57aecbae6b42 (diff) | |
| parent | 2ce709cf4a4d46b058218a965885cecfa1568b1f (diff) | |
| download | gstreamer-plugins-bad-2fca270f1956fa3379ebca02203e3f95ae8aba42.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvedemux.c
Diffstat (limited to 'gst/camerabin2/gstwrappercamerabinsrc.c')
| -rw-r--r-- | gst/camerabin2/gstwrappercamerabinsrc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c index 3bc047108..cef902d87 100644 --- a/gst/camerabin2/gstwrappercamerabinsrc.c +++ b/gst/camerabin2/gstwrappercamerabinsrc.c @@ -163,7 +163,10 @@ gst_wrapper_camera_bin_reset_video_src_caps (GstWrapperCameraBinSrc * self, self->drop_newseg = TRUE; GST_DEBUG_OBJECT (self, "Bringing source up"); - gst_element_sync_state_with_parent (self->src_vid_src); + if (!gst_element_sync_state_with_parent (self->src_vid_src)) { + GST_WARNING_OBJECT (self, "Failed to reset source caps"); + gst_element_set_state (self->src_vid_src, GST_STATE_NULL); + } if (clock) { gst_element_set_clock (self->src_vid_src, clock); |