mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
gst-libs/gst/audio/gstringbuffer.c: Don't assert on normal stuff.
Original commit message from CVS: * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_commit), (gst_ring_buffer_read), (gst_ring_buffer_clear): Don't assert on normal stuff. * gst/playback/gstplaybin.c: (do_playbin_seek): API fix.
This commit is contained in:
parent
7bc8bee1e1
commit
1355459057
3 changed files with 14 additions and 4 deletions
|
@ -1,3 +1,12 @@
|
|||
2005-10-12 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_commit),
|
||||
(gst_ring_buffer_read), (gst_ring_buffer_clear):
|
||||
Don't assert on normal stuff.
|
||||
|
||||
* gst/playback/gstplaybin.c: (do_playbin_seek):
|
||||
API fix.
|
||||
|
||||
2005-10-12 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* check/pipelines/simple_launch_lines.c: (run_pipeline):
|
||||
|
|
|
@ -1204,7 +1204,10 @@ gst_ring_buffer_clear (GstRingBuffer * buf, gint segment)
|
|||
guint8 *data;
|
||||
|
||||
g_return_if_fail (buf != NULL);
|
||||
g_return_if_fail (buf->data != NULL);
|
||||
/* no data means it's allready cleared */
|
||||
if (buf->data == NULL)
|
||||
return;
|
||||
|
||||
g_return_if_fail (buf->empty_seg != NULL);
|
||||
|
||||
data = GST_BUFFER_DATA (buf->data);
|
||||
|
|
|
@ -897,12 +897,10 @@ do_playbin_seek (GstElement * element, GstEvent * event)
|
|||
|
||||
if (flush) {
|
||||
GstState state;
|
||||
GTimeVal timeout;
|
||||
|
||||
GST_TIME_TO_TIMEVAL (0, timeout);
|
||||
/* need to call _get_state() since a bin state is only updated
|
||||
* with this call. */
|
||||
gst_element_get_state (element, &state, NULL, &timeout);
|
||||
gst_element_get_state (element, &state, NULL, 0);
|
||||
was_playing = state == GST_STATE_PLAYING;
|
||||
|
||||
if (was_playing) {
|
||||
|
|
Loading…
Reference in a new issue