diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
| commit | 68c0790817b4dedf8d4d028631e98d66171e73c0 (patch) | |
| tree | 1063f6bb873d4ab3bee85e2310e06ad9f9232261 /gst/playback/gststreamsynchronizer.c | |
| parent | cd8742fdcb71e9bb3f987e5f98594c20b5c08134 (diff) | |
| parent | bd900a6c856c536c783aa7a53e3c6b19f3cb8bf9 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/interfaces/propertyprobe.c
sys/xvimage/xvimagesink.c
Diffstat (limited to 'gst/playback/gststreamsynchronizer.c')
| -rw-r--r-- | gst/playback/gststreamsynchronizer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/playback/gststreamsynchronizer.c b/gst/playback/gststreamsynchronizer.c index 77bf80360..3e155d136 100644 --- a/gst/playback/gststreamsynchronizer.c +++ b/gst/playback/gststreamsynchronizer.c @@ -543,7 +543,8 @@ gst_stream_synchronizer_sink_chain (GstPad * pad, GstObject * parent, GST_STREAM_SYNCHRONIZER_LOCK (self); stream = gst_pad_get_element_private (pad); - stream->seen_data = TRUE; + if (stream) + stream->seen_data = TRUE; if (stream && stream->drop_discont) { buffer = gst_buffer_make_writable (buffer); GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT); |